f4df263d6e 
								
							
								 
							
						 
						
							
							
								
								Flash message is informative. Why not add it?  
							
							
							
						 
						
							2023-08-11 19:14:51 +08:00  
				
					
						
							
							
								 
						
							
							
								dff560cc73 
								
							
								 
							
						 
						
							
							
								
								Indent code using web-mode.  
							
							
							
						 
						
							2023-08-11 18:39:36 +08:00  
				
					
						
							
							
								 
						
							
							
								c110de0393 
								
							
								 
							
						 
						
							
							
								
								Better spacing.  
							
							
							
						 
						
							2023-08-11 18:38:35 +08:00  
				
					
						
							
							
								 
						
							
							
								aaabd3e3bb 
								
							
								 
							
						 
						
							
							
								
								Enlarge button size so it is more table-friendly.  
							
							
							
						 
						
							2023-08-11 18:34:48 +08:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e4f870c995 
								
							
								 
							
						 
						
							
							
								
								Create folder app/db with a README file.  
							
							
							
						 
						
							2023-08-10 15:25:42 +08:00  
				
					
						
							
							
								 
						
							
							
								06f896a33a 
								
							
								 
							
						 
						
							
							
								
								Update .gitignore  
							
							
							
						 
						
							2023-08-10 15:22:30 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
							
								20051e1a93 
								
							
								 
							
						 
						
							
							
								
								article.py: correct data format  
							
							
							
						 
						
							2023-07-14 09:17:11 +08:00  
				
					
						
							
							
								 
						
							
							
								5711f0e826 
								
							
								 
							
						 
						
							
							
								
								Update flask version in requirements.txt, use escape from markupsafe package.  
							
							
							
						 
						
							2023-07-14 09:11:02 +08:00  
				
					
						
							
							
								 
						
							
							
								cc92e5e29a 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: non-programmers probably do not know int. So, use integer instead.  
							
							
							
						 
						
							2023-07-14 08:32:20 +08:00  
				
					
						
							
							
								 
						
							
							
								cd562a745c 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: do not need to have seperate lines for a statement.  
							
							
							
						 
						
							2023-07-14 08:30:58 +08:00  
				
					
						
							
							
								 
						
							
							
								c284893097 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: correct typo parmas.  
							
							
							
						 
						
							2023-07-14 08:27:33 +08:00  
				
					
						
							
							
								 
						
							
							
								87fd594636 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: refactor view function article().  
							
							
							
						 
						
							2023-07-14 08:26:37 +08:00  
				
					
						
							
							
								 
						
							
							
								18c37d583a 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: show article content for the newly added article after clicking the button '保存'.  
							
							
							
						 
						
							2023-07-14 08:15:15 +08:00  
				
					
						
							
							
								 
						
							
							
								472c0c115f 
								
							
								 
							
						 
						
							
							
								
								Fix Bug 541  
							
							
							
						 
						
							2023-07-09 20:26:32 +08:00  
				
					
						
							
							
								 
						
							
							
								9a156ebf7e 
								
							
								 
							
						 
						
							
							
								
								Fix Bug 539  
							
							
							
						 
						
							2023-07-08 18:23:45 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								807d74741b 
								
							
								 
							
						 
						
							
							
								
								修复 Bug 493。不要转义(escape)表单提交的内容。否则类 WordFreq 不能正确工作,比如转义会把单引号变成 ',这不利于 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  
				
					
						
							
							
								 
						
							
							
								4d2535a6e8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Alpha-snapshot20230605' into Bug527-ZhouZhifang  
							
							
							
						 
						
							2023-06-15 15:59:29 +08:00  
				
					
						
							
							
								 
						
							
							
								bb2d0363e4 
								
							
								 
							
						 
						
							
							
								
								Feat: update fontsize and margin of some elements  
							
							
							
						 
						
							2023-06-15 15:54:46 +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  
				
					
						
							
							
								
									
								
								顾涵 
							
						 
						
							
							
								688a198768 
								
							
								 
							
						 
						
							
							
								
								已经与Alpha-snapshot20230525 分支同步,重新提交  
							
							
							
						 
						
							2023-05-28 16:31:12 +08:00  
				
					
						
							
							
								
									
								
								黄子睿 
							
						 
						
							
							
								a0ddf4bdad 
								
							
								 
							
						 
						
							
							
								
								上传文件至 'app/static/js'  
							
							... 
							
							
							
							修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词,单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。 
							
						 
						
							2023-05-27 17:33:37 +08:00  
				
					
						
							
							
								
									
								
								寻宇灿 
							
						 
						
							
							
								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  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								b41e1044bc 
								
							
								 
							
						 
						
							
							
								
								difficulty.py: add some stop words, hoping that getting the next article can be faster.  
							
							
							
						 
						
							2023-05-24 10:12:44 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								67e921ba60 
								
							
								 
							
						 
						
							
							
								
								difficulty.py: todo.  
							
							
							
						 
						
							2023-05-23 22:25:40 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								a5c3564f15 
								
							
								 
							
						 
						
							
							
								
								difficulty.py: do not stem a word twice.  
							
							
							
						 
						
							2023-05-23 22:22:57 +08:00  
				
					
						
							
							
								
									
								
								俞黄焘 
							
						 
						
							
							
								c151a0efaa 
								
							
								 
							
						 
						
							
							
								
								去掉了get_difficulty_level_for_user的多出的break  
							
							
							
						 
						
							2023-05-23 19:40:33 +08:00  
				
					
						
							
							
								
									
								
								顾涵 
							
						 
						
							
							
								030b89706e 
								
							
								 
							
						 
						
							
							
								
								special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个“-”字符对程序的过滤过程不会造成问题。  
							
							
							
						 
						
							2023-05-20 15:29:12 +08:00  
				
					
						
							
							
								
									
								
								俞黄焘 
							
						 
						
							
							
								39d96014d9 
								
							
								 
							
						 
						
							
							
								
								pull最新的snapshot-20230511,后更新了difficulty.py和Article.py的部分代码,提交了新的pickle文件  
							
							
							
						 
						
							2023-05-18 23:29:38 +08:00  
				
					
						
							
							
								
									
								
								顾涵 
							
						 
						
							
							
								acd8db6e3e 
								
							
								 
							
						 
						
							
							
								
								special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个对“1-”字符的过滤不会造成问题。  
							
							
							
						 
						
							2023-05-15 19:24:43 +08:00  
				
					
						
							
							
								
									
								
								顾涵 
							
						 
						
							
							
								9f3f5b43e1 
								
							
								 
							
						 
						
							
							
								
								special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个对“-”字符的过滤不会造成问题。  
							
							
							
						 
						
							2023-05-15 19:15:30 +08:00  
				
					
						
							
							
								 
						
							
							
								d9f6df7fbe 
								
							
								 
							
						 
						
							
							
								
								AJAX载入文章数据  
							
							
							
						 
						
							2023-05-11 15:51:10 +08:00  
				
					
						
							
							
								 
						
							
							
								5039f5710e 
								
							
								 
							
						 
						
							
							
								
								AJAX载入文章数据  
							
							
							
						 
						
							2023-05-08 14:33:48 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								becef7e343 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Bug502-YuGaoXiang' of  http://121.4.94.30:3000/mrlan/EnglishPal  into Alpha-snapshot20230506  
							
							
							
						 
						
							2023-05-07 15:59:35 +08:00  
				
					
						
							
							
								
									
								
								倪玲丽 
							
						 
						
							
							
								df64065dcc 
								
							
								 
							
						 
						
							
							
								
								点击上下篇,停止阅读  
							
							
							
						 
						
							2023-05-06 18:19:24 +08:00  
				
					
						
							
							
								
									
								
								倪玲丽 
							
						 
						
							
							
								ce28b91bd5 
								
							
								 
							
						 
						
							
							
								
								屏幕刷新,停止阅读  
							
							
							
						 
						
							2023-05-06 18:18:12 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								01ecc83768 
								
							
								 
							
						 
						
							
							
								
								refactor: refactor the way to check article level  
							
							
							
						 
						
							2023-05-06 17:42:04 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								f64d06fbbf 
								
							
								 
							
						 
						
							
							
								
								fix: fix Bug 531 and use ES6 grammar  
							
							
							
						 
						
							2023-05-06 17:24:51 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a80b062b87 
								
							
								 
							
						 
						
							
							
								
								refactor: remove variable 'count'  
							
							
							
						 
						
							2023-05-05 17:20:58 +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  
				
					
						
							
							
								
								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  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								5654fbf9bc 
								
							
								 
							
						 
						
							
							
								
								修改:使用新的/<username>/userpage路由  
							
							
							
						 
						
							2023-04-26 18:49:59 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								d30a434b2a 
								
							
								 
							
						 
						
							
							
								
								修改变量名had_read_articles->visited_articles  
							
							
							
						 
						
							2023-04-25 17:47:51 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								b88bc8f36b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Bug509-XieQiuHan-WangZiming' of  http://121.4.94.30:3000/mrlan/EnglishPal  into Alpha-snapshot20230425  
							
							
							
						 
						
							2023-04-25 11:40:42 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								6be035f282 
								
							
								 
							
						 
						
							
							
								
								修复当没有找到文章或者文章读完时,直接刷新页面或者session不关闭重新进入页面,导致的错误;  
							
							
							
						 
						
							2023-04-25 11:38:01 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								ef786795e2 
								
							
								 
							
						 
						
							
							
								
								Resolve merge conflict  
							
							
							
						 
						
							2023-04-25 08:47:22 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								21a77ef2df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Alpha' of  http://121.4.94.30:3000/mrlan/EnglishPal  into Alpha  
							
							
							
						 
						
							2023-04-25 08:42:18 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								58d7349afe 
								
							
								 
							
						 
						
							
							
								
								Change from bug359-zhangkeli  
							
							
							
						 
						
							2023-04-25 08:40:26 +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 
							
						 
						
							
							
								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  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								fc3e27488b 
								
							
								 
							
						 
						
							
							
								
								给标签添加id,方便测试  
							
							
							
						 
						
							2023-04-21 05:33:26 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								03145b57d9 
								
							
								 
							
						 
						
							
							
								
								修复边界值问题(当刚开始就没有找到文章或者就根本被没有文章的时候,会出现上一篇按钮)  
							
							
							
						 
						
							2023-04-21 02:36:51 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								70917df47b 
								
							
								 
							
						 
						
							
							
								
								删除测试代码  
							
							
							
						 
						
							2023-04-20 23:15:12 +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  
				
					
						
							
							
								 
						
							
							
								cc8ca47f8c 
								
							
								 
							
						 
						
							
							
								
								refactor: remove sql sentences  
							
							
							
						 
						
							2023-04-18 21:50:54 +08:00  
				
					
						
							
							
								 
						
							
							
								5d20e92061 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Bug522-HuangZirui' of  http://121.4.94.30:3000/mrlan/EnglishPal  into DevLocal  
							
							
							
						 
						
							2023-04-18 21:50:18 +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  
				
					
						
							
							
								 
						
							
							
								688ed72473 
								
							
								 
							
						 
						
							
							
								
								Correct grammar。  
							
							
							
						 
						
							2023-04-01 16:07:59 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								1f150fc847 
								
							
								 
							
						 
						
							
							
								
								refactor: use ajax to get expiry_date  
							
							
							
						 
						
							2023-03-31 13:39:28 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								4417cf7017 
								
							
								 
							
						 
						
							
							
								
								Article.py: remove debug statement.  
							
							
							
						 
						
							2023-03-30 16:10:22 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								0c16a4dc6f 
								
							
								 
							
						 
						
							
							
								
								判断文章是否已经出现的语句写错位置了,改正下  
							
							
							
						 
						
							2023-03-29 20:53:38 +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  
				
					
						
							
							
								 
						
							
							
								0ce1c6eb6e 
								
							
								 
							
						 
						
							
							
								
								文章管理页面:每篇文章中保留换行,方便查看。  
							
							
							
						 
						
							2023-03-26 21:14:29 +08:00  
				
					
						
							
							
								 
						
							
							
								d4ac709385 
								
							
								 
							
						 
						
							
							
								
								将删除按钮移到第一行,避免因为文章的标题过长跨行导致删除按钮形状改变。  
							
							
							
						 
						
							2023-03-26 21:05:05 +08:00  
				
					
						
							
							
								 
						
							
							
								9eb5210d3f 
								
							
								 
							
						 
						
							
							
								
								Level与Date的冒号后面加个空格,使得后面的信息更加看得清楚。  
							
							
							
						 
						
							2023-03-26 20:58:37 +08:00  
				
					
						
							
							
								 
						
							
							
								0e25737381 
								
							
								 
							
						 
						
							
							
								
								管理文章页面的文章列表中,每篇文章不再在内容部分重新显示标题。  
							
							
							
						 
						
							2023-03-26 20:56:08 +08:00  
				
					
						
							
							
								 
						
							
							
								b3b154a24f 
								
							
								 
							
						 
						
							
							
								
								简化管理文章与管理用户页面信息。  
							
							
							
						 
						
							2023-03-26 19:06:04 +08:00  
				
					
						
							
							
								 
						
							
							
								4d99405bfa 
								
							
								 
							
						 
						
							
							
								
								简化管理员页面信息。删除退出登录按钮,可以返回到前一页后再退出,不影响使用体验。删除'管理员您好'欢迎词,没啥意义。  
							
							
							
						 
						
							2023-03-26 18:59:15 +08:00  
				
					
						
							
							
								 
						
							
							
								8d8b9197b6 
								
							
								 
							
						 
						
							
							
								
								手动输入的文字最高难度等级是4  
							
							
							
						 
						
							2023-03-26 09:59:06 +08:00  
				
					
						
							
							
								 
						
							
							
								3bc61a602f 
								
							
								 
							
						 
						
							
							
								
								添加文章成功后,修改用户信息成功后,页面显示成功信息(flash messages)。  
							
							
							
						 
						
							2023-03-26 09:44:39 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								fb6d0b23ce 
								
							
								 
							
						 
						
							
							
								
								admin_manage_user.html: 修改 JavaScript 函数名.  
							
							
							
						 
						
							2023-03-25 22:21:49 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								c6010ccbbd 
								
							
								 
							
						 
						
							
							
								
								admin_manage_user.html: 不再需要,所以删除.  
							
							
							
						 
						
							2023-03-25 21:45:37 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								f17995a35c 
								
							
								 
							
						 
						
							
							
								
								fix: using new pagination mod func  
							
							
							
						 
						
							2023-03-25 21:31:32 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								ce28a5bf65 
								
							
								 
							
						 
						
							
							
								
								feat: auto select expiry_date when select user  
							
							
							
						 
						
							2023-03-25 21:20:19 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								99aa4e0990 
								
							
								 
							
						 
						
							
							
								
								fix: fix article title show  
							
							
							
						 
						
							2023-03-25 20:41:09 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								a220450b03 
								
							
								 
							
						 
						
							
							
								
								mainpage_get.html: 首页不显示管理链接(可能会安全点).  
							
							
							
						 
						
							2023-03-23 22:05:36 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								7eb276937a 
								
							
								 
							
						 
						
							
							
								
								admin_manage_user.html: 将默认过期时间设为365天以后.  
							
							
							
						 
						
							2023-03-23 21:54:21 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								b97210a9e0 
								
							
								 
							
						 
						
							
							
								
								admin_manage_article.html: 更为详细的 placeholder 内容.  
							
							
							
						 
						
							2023-03-23 21:19:20 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								e27985127a 
								
							
								 
							
						 
						
							
							
								
								admin_manage_article.html: 文章最高难度等级是4.  
							
							
							
						 
						
							2023-03-23 21:00:31 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								7941e5d1eb 
								
							
								 
							
						 
						
							
							
								
								fix: fix the way to show article title  
							
							
							
						 
						
							2023-03-23 17:34:37 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								2cf65123e9 
								
							
								 
							
						 
						
							
							
								
								feat: admin can manage articles and users without interfering with each other  
							
							
							
						 
						
							2023-03-23 17:12:23 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								3e35679a91 
								
							
								 
							
						 
						
							
							
								
								refactor: refactor the model  
							
							
							
						 
						
							2023-03-23 17:09:25 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								13ccbaf25c 
								
							
								 
							
						 
						
							
							
								
								fix: use select to choose article level  
							
							
							
						 
						
							2023-03-23 13:58:11 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								ec6a2249ae 
								
							
								 
							
						 
						
							
							
								
								fix: fix the pagination  
							
							
							
						 
						
							2023-03-23 13:47:53 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								bdda754af6 
								
							
								 
							
						 
						
							
							
								
								fix: check current user is admin  
							
							
							
						 
						
							2023-03-23 13:40:22 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								52025d55bc 
								
							
								 
							
						 
						
							
							
								
								fix: add a blankspace  
							
							
							
						 
						
							2023-03-23 13:35:10 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								5cffa1fada 
								
							
								 
							
						 
						
							
							
								
								fix: use single quotation mark 'admin'  
							
							
							
						 
						
							2023-03-23 13:32:11 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								c9bfa08658 
								
							
								 
							
						 
						
							
							
								
								注释flash的使用,因为其对页面会有影响  
							
							
							
						 
						
							2023-03-21 19:19:51 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								6df25c58b4 
								
							
								 
							
						 
						
							
							
								
								查漏,业务中的两处前端标签不做修改,因为不被使用了  
							
							
							
						 
						
							2023-03-21 18:57:00 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								2909b4d973 
								
							
								 
							
						 
						
							
							
								
								admin_service.py: 管理员页面显示的用户名按照名字排序。  
							
							
							
						 
						
							2023-03-21 16:22:45 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								44db2218c1 
								
							
								 
							
						 
						
							
							
								
								fix: Use better conditional judgment methods  
							
							
							
						 
						
							2023-03-21 12:45:57 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								48de496caa 
								
							
								 
							
						 
						
							
							
								
								fix: Remove 'Assignment Expresions' & Fix annotation words  
							
							
							
						 
						
							2023-03-21 12:42:59 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								1015704e23 
								
							
								 
							
						 
						
							
							
								
								fix: fix the way to check article level  
							
							
							
						 
						
							2023-03-21 12:35:27 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								cabf6702a7 
								
							
								 
							
						 
						
							
							
								
								fix: add one way to set article level & rename some functions and vars  
							
							
							
						 
						
							2023-03-21 12:35:27 +08:00  
				
					
						
							
							
								 
						
							
							
								70d44fcf5c 
								
							
								 
							
						 
						
							
							
								
								Login.py: fix SyntaxWrning: 'is not' with a literal.  
							
							
							
						 
						
							2023-03-21 11:44:05 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								b80fbc936c 
								
							
								 
							
						 
						
							
							
								
								fix: fix admin_name  
							
							
							
						 
						
							2023-03-20 20:19:56 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								ade10e5843 
								
							
								 
							
						 
						
							
							
								
								feat: add admin_service blueprint  
							
							
							
						 
						
							2023-03-20 20:16:48 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								13d8977636 
								
							
								 
							
						 
						
							
							
								
								fix: set specific management displays for admin  
							
							
							
						 
						
							2023-03-20 20:15:58 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								e2b165ada8 
								
							
								 
							
						 
						
							
							
								
								fix: add url 'admin' into banned url list  
							
							
							
						 
						
							2023-03-20 20:12:41 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								df82748518 
								
							
								 
							
						 
						
							
							
								
								feat: create classes necessary for orm operations  
							
							
							
						 
						
							2023-03-20 20:09:32 +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  
				
					
						
							
							
								
								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  
				
					
						
							
							
								
									
								
								陈秋伟 
							
						 
						
							
							
								972a1a5524 
								
							
								 
							
						 
						
							
							
								
								Bug490-ChenQiuwei ( #63 )  
							
							... 
							
							
							
							修复Bug-490,使注册时确认密码能够发挥作用,在确认密码与所设置密码不一致时,能够提示“确认密码与输入密码不一致”。
Co-authored-by: 2658626578 <2658626578@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/63 
Co-authored-by: 陈秋伟 <2658626578@qq.com>
Co-committed-by: 陈秋伟 <2658626578@qq.com> 
							
						 
						
							2023-01-29 11:49:27 +08:00  
				
					
						
							
							
								 
						
							
							
								c52d53596f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request 'Bug489-DingRui' ( #74 ) from SPM2022F-CONTRIBUTORS-DingRui into master  
							
							... 
							
							
							
							Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/74  
							
						 
						
							2023-01-29 11:31:41 +08:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								03353d49b1 
								
							
								 
							
						 
						
							
							
								
								Bug525-Hui ( #79 )  
							
							... 
							
							
							
							Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/79 
Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
Co-committed-by: mrlan <mrlan@noreply.121.4.94.30> 
							
						 
						
							2023-01-29 10:57:58 +08:00  
				
					
						
							
							
								 
						
							
							
								1373df2a3e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request '增加单词默认勾选,并修改提示 Fix Bug 495 - Liang Li Gang' ( #77 ) from Bug495-LiangLiGang into master  
							
							... 
							
							
							
							Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/77  
							
						 
						
							2023-01-29 10:27:22 +08:00  
				
					
						
							
							
								 
						
							
							
								0209548896 
								
							
								 
							
						 
						
							
							
								
								提交作业  
							
							
							
						 
						
							2022-12-31 18:25:13 +08:00  
				
					
						
							
							
								
									
								
								徐嘉辉 
							
						 
						
							
							
								74eccfbebd 
								
							
								 
							
						 
						
							
							
								
								重复文章刷新  
							
							
							
						 
						
							2022-12-20 19:55:02 +08:00  
				
					
						
							
							
								 
						
							
							
								086dfcb6eb 
								
							
								 
							
						 
						
							
							
								
								fix bug 489  
							
							
							
						 
						
							2022-12-19 17:54:10 +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  
				
					
						
							
							
								
									
								
								岑昊天 
							
						 
						
							
							
								f37ea182f6 
								
							
								 
							
						 
						
							
							
								
								加入生词库过滤|  
							
							
							
						 
						
							2022-12-06 17:02:59 +08:00