WIP: Alpha-snapshot20230621 Bug543-Aya #115

aya · 2024-04-24T14:42:26+08:00

aya commented

2024-04-24 14:42:26 +08:00

HxH

aya added 88 commits 2024-04-24 14:42:27 +08:00

8924166975 上传文件至 'static\js'

3eca9234a9 Merge branch 'Bug393-TanYanMei' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei

320a99d479 Move Tan Yanmei's fillword.js to app/static/js/tanyanmei-fillword.js. Delete the strange folder static js.

e9e2bd3d23 Remove static\js

d6bd24ee1c Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei

merge alpha

ce28b91bd5 屏幕刷新，停止阅读

df64065dcc 点击上下篇，停止阅读

a0ddf4bdad 上传文件至 'app/static/js'

修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词，单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。

38837c9c2f 合并最新的Alpha-snapshot20230529

cdf6180901 刷新屏幕，点击上下篇，加入生词库，停止阅读

d402bb45cb 刷新屏幕，点击上下篇，加入生词库，停止阅读(更改)

b22c654f0f Merge branch 'Bug529-GuHan' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230601

682247bff1 refactor partial function and code writing specifications

9816596cf8 删除 'app/static/js/tanyanmei-fillword.js'

bb2d0363e4 Feat: update fontsize and margin of some elements

4d2535a6e8 Merge branch 'Alpha-snapshot20230605' into Bug527-ZhouZhifang

f01c334827 Fix: no-random secret key generation and XSS vulnerability

2277473afe Fix: Add import for 'abort' function

f40a388277 Fix: Move wordfreqapp.db to new location

c37ee98b77 Merge branch 'fix-vuln' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230619b

582f399f73 Bug537 and Bug538

287d496ae9 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621

807d74741b 修复 Bug 493。不要转义（escape）表单提交的内容。否则类 WordFreq 不能正确工作，比如转义会把单引号变成 '，这不利于 WordFreq 类处理。

9a156ebf7e Fix Bug 539

472c0c115f Fix Bug 541

18c37d583a admin_service.py: show article content for the newly added article after clicking the button '保存'.

87fd594636 admin_service.py: refactor view function article().

c284893097 admin_service.py: correct typo parmas.

cd562a745c admin_service.py: do not need to have seperate lines for a statement.

cc92e5e29a admin_service.py: non-programmers probably do not know int. So, use integer instead.

5711f0e826 Update flask version in requirements.txt, use escape from markupsafe package.

20051e1a93 article.py: correct data format

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.

fb80e952b9 Simplify the docker run options

79bdec2a7d Dockerfile: update docker image version.

78d9a66e88 After loading the next article, show its difficulty level in a larger size for one second.

43419ab4b6 Enlarge text difficult level for one second (make it work using vanilla JavaScript)

b8c3d9bda7 No cache while building docker image

14ab63c85c 文章段落正确分段（在 lead class 中添加 white-space: pre-wrap;）

a397c756cf Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621

00ae957b27 Try to figure out how to rebuild the image after updating the source code.

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。即可解决问题。

25c2e0aca8 README.md: update the path to wordfreqapp.db.

06f896a33a Update .gitignore

e4f870c995 Create folder app/db with a README file.

6d15b65e3c Make highlighting text difficulty level work.

10c291bed2 Highlight user difficulty level too.

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

83bbd8f600 Improve the speed of loading the next article further after incorporating Chen Qiuwei et al.'s suggestions.

9b1d60748d Increase button size so that it is easier to use on tablets .

9da1a1cae6 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621

aaabd3e3bb Enlarge button size so it is more table-friendly.

c110de0393 Better spacing.

dff560cc73 Indent code using web-mode.

f4df263d6e Flash message is informative. Why not add it?

e9ac50422b Make the flash message dismissible.

f3aa407c56 Use small letters for In and Up.

ed1d0fd714 Show only one place after the decimal point.

d2f30daab1 Use PonyORM instead of class RecordQuery from UseSqlite.py. Incorporated changes from Pull Request 91 contributed by He Zhengzheng.

8dd6a2a343 Use an arrow for Next Article or Previsou Article