AliasJeff 
							
						 
						
							
							
								b5bde9d33d 
								
							
								 
							
						 
						
							
							
								
								test: update test file, update username/password config, add pytest to requirements.txt  
							
							
							
						 
						
							2024-04-09 22:09:50 +08:00  
				
					
						
							
							
								
								AliasJeff 
							
						 
						
							
							
								83491ce28c 
								
							
								 
							
						 
						
							
							
								
								refactor: Add comments & optimize code  
							
							
							
						 
						
							2024-04-09 21:21:19 +08:00  
				
					
						
							
							
								 
						
							
							
								77a3adb546 
								
							
								 
							
						 
						
							
							
								
								Define fixture 'restore_sqlite_database' that will be automatically used to restore the database before starting each test  
							
							
							
						 
						
							2024-04-09 20:06:30 +08:00  
				
					
						
							
							
								 
						
							
							
								4f91659713 
								
							
								 
							
						 
						
							
							
								
								How to run pytest  
							
							
							
						 
						
							2024-04-09 16:13:05 +08:00  
				
					
						
							
							
								 
						
							
							
								083cbfd040 
								
							
								 
							
						 
						
							
							
								
								Ignore app/test/assets  
							
							
							
						 
						
							2024-04-09 16:01:44 +08:00  
				
					
						
							
							
								 
						
							
							
								0dc253bc19 
								
							
								 
							
						 
						
							
							
								
								Ignore pytest_report.html  
							
							
							
						 
						
							2024-04-09 15:58:47 +08:00  
				
					
						
							
							
								 
						
							
							
								a4608db424 
								
							
								 
							
						 
						
							
							
								
								Correct code comments  
							
							
							
						 
						
							2024-04-09 13:21:44 +08:00  
				
					
						
							
							
								 
						
							
							
								0a63c5354a 
								
							
								 
							
						 
						
							
							
								
								Make test_add_word.py work again  
							
							
							
						 
						
							2024-04-09 12:11:30 +08:00  
				
					
						
							
							
								
									
								
								林杉 
							
						 
						
							
							
								b7fe68c54d 
								
							
								 
							
						 
						
							
							
								
								test_bug553  
							
							
							
						 
						
							2024-04-08 16:37:15 +08:00  
				
					
						
							
							
								
									
								
								唐娇 
							
						 
						
							
							
								85a3faaa9f 
								
							
								 
							
						 
						
							
							
								
								Fix bug 528  
							
							
							
						 
						
							2024-04-06 00:18:44 +08:00  
				
					
						
							
							
								
									
								
								唐欣媛 
							
						 
						
							
							
								2966a8162f 
								
							
								 
							
						 
						
							
							
								
								Fix bug 544  
							
							
							
						 
						
							2024-03-27 12:39:42 +08:00  
				
					
						
							
							
								
									
								
								林杉 
							
						 
						
							
							
								b8f2919959 
								
							
								 
							
						 
						
							
							
								
								Fix bug 553  
							
							
							
						 
						
							2024-03-25 10:15:11 +08:00  
				
					
						
							
							
								
									
								
								林杉 
							
						 
						
							
							
								f164465903 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' of  http://118.25.96.118:3000/mrlan/EnglishPal  into Bug553_LinShan  
							
							
							
						 
						
							2024-03-25 10:14:32 +08:00  
				
					
						
							
							
								
									
								
								唐娇 
							
						 
						
							
							
								292972c0ce 
								
							
								 
							
						 
						
							
							
								
								Fix bug 528  
							
							
							
						 
						
							2024-03-19 14:59:36 +08:00  
				
					
						
							
							
								
									
								
								林杉 
							
						 
						
							
							
								04c4064c68 
								
							
								 
							
						 
						
							
							
								
								Fix bug 553  
							
							
							
						 
						
							2024-03-18 13:21:46 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								7d5b1c0ed4 
								
							
								 
							
						 
						
							
							
								
								Fix ImportError: cannot import name 'url_quote'  
							
							
							
						 
						
							2024-02-22 16:27:31 +08:00  
				
					
						
							
							
								 
						
							
							
								d9e28e3a2b 
								
							
								 
							
						 
						
							
							
								
								Tweak button size so it looks better on tablets.  
							
							
							
						 
						
							2023-08-13 21:08:13 +08:00  
				
					
						
							
							
								 
						
							
							
								41d1d9619d 
								
							
								 
							
						 
						
							
							
								
								Stress test code contributed by students  
							
							
							
						 
						
							2023-08-13 16:14:43 +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  
				
					
						
							
							
								 
						
							
							
								d2f30daab1 
								
							
								 
							
						 
						
							
							
								
								Use PonyORM instead of class RecordQuery from UseSqlite.py. Incorporated changes from Pull Request 91 contributed by He Zhengzheng.  
							
							
							
						 
						
							2023-08-12 15:29:12 +08:00  
				
					
						
							
							
								 
						
							
							
								ed1d0fd714 
								
							
								 
							
						 
						
							
							
								
								Show only one place after the decimal point.  
							
							
							
						 
						
							2023-08-11 21:02:22 +08:00  
				
					
						
							
							
								 
						
							
							
								f3aa407c56 
								
							
								 
							
						 
						
							
							
								
								Use small letters for In and Up.  
							
							
							
						 
						
							2023-08-11 19:32:34 +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  
				
					
						
							
							
								 
						
							
							
								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 
							
						 
						
							
							
								25c2e0aca8 
								
							
								 
							
						 
						
							
							
								
								README.md: update the path to wordfreqapp.db.  
							
							
							
						 
						
							2023-08-10 14:24:00 +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  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								a397c756cf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' of  http://121.4.94.30:3000/mrlan/EnglishPal  into Alpha-snapshot20230621  
							
							
							
						 
						
							2023-08-10 10:05:29 +08:00  
				
					
						
							
							
								 
						
							
							
								14ab63c85c 
								
							
								 
							
						 
						
							
							
								
								文章段落正确分段(在 lead class 中添加 white-space: pre-wrap;)  
							
							
							
						 
						
							2023-08-10 10:03:02 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								b8c3d9bda7 
								
							
								 
							
						 
						
							
							
								
								No cache while building docker image  
							
							
							
						 
						
							2023-07-17 17:46:55 +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 
							
						 
						
							
							
								79bdec2a7d 
								
							
								 
							
						 
						
							
							
								
								Dockerfile: update docker image version.  
							
							
							
						 
						
							2023-07-17 10:38:17 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								fb80e952b9 
								
							
								 
							
						 
						
							
							
								
								Simplify the docker run options  
							
							
							
						 
						
							2023-07-17 10:25:07 +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