baoyuelin
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
214 Commits
105 Branches
0 Tags
5.9 MiB
Commit Graph

127 Commits (2a553e0f8f91f6d0b3d625edbc2a45afb8da806f)

Author SHA1 Message Date
Lan Hui 2a553e0f8f Use a better variable name. 2022-07-21 22:17:50 +08:00
Lan Hui 4513a80bdd Remove unused code. 2022-07-21 22:15:07 +08:00
Lan Hui e73c66edd3 Re-arrange button positions (put Next Article before Previous Article). 2022-07-21 22:12:35 +08:00
Lan Hui 69835c7f8d Merge branch 'Bug422-XuXing' into Bug422-XuXing 2022-07-21 22:05:48 +08:00
Lan Hui e9eb604a22 Improve spacing and indentation. 2022-07-20 17:10:03 +08:00
Lan Hui 9beb1ad1d2 Make up the enclosing >. 2022-07-20 17:09:04 +08:00
Lan Hui 8998d6e4af Improve spacing. 2022-07-20 17:08:07 +08:00
Lan Hui 8747f35fd8 Make up the enclosing >. 2022-07-20 17:07:09 +08:00
Lan Hui fdb432031f Better indentation. 2022-07-20 17:06:11 +08:00
Lan Hui 1401870591 Use Chinese UI language. 2022-07-20 17:04:34 +08:00
Lan Hui 1ca90bb2a9 Remove superfluous 'jjj'. 2022-07-20 17:00:13 +08:00
Lan Hui ea19658212 Merge branch 'Improvement-Stewart' 2022-07-20 16:57:31 +08:00
Lan Hui 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
徐幸 71cc627aad 更新 'app/templates/userpage_get.html' 2022-06-15 11:42:46 +08:00
徐幸 22775f9797 上传文件至 'app' 2022-06-14 15:58:21 +08:00
徐幸 9e36644215 增加返回上一篇按钮 2022-06-14 15:56:12 +08:00
stewy 6823c10043 improved 2022-06-14 13:25:42 +08:00
stewy ee44372848 improved 2022-06-14 12:37:28 +08:00
miaochenshuo 260f62967b 修复 Bug394 2022-06-05 23:36:55 +08:00
Hui Lan 5976f758a0 Remove pyc files. 2022-02-05 23:01:01 +08:00
Hui Lan 18684ada6b build.sh: deploy the new code 2022-02-05 22:59:45 +08:00
Lan Hui f675870401 templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐 2022-01-27 20:15:26 +08:00
Lan Hui 8dab62df7e templates/mainpage_get.html: fix typo -- 陈天乐 2022-01-27 20:12:10 +08:00
mrlan c43e4c3f7c Merge pull request 'Use named style for sqlite3 execute()' (#22) from Hui-SaferSQL into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/22
 2022-01-27 17:09:29 +08:00
Lan Hui 18dfad910b Use named style for sqlite3 execute() 2022-01-27 17:01:03 +08:00
Lan Hui 788bca8873 templates/signup.html: user name must not be empty. Bug reported and fixed by 丁宇超. For more details, see http://118.25.96.118/bugzilla/show_bug.cgi?id=347 and http://118.25.96.118/kanboard/?controller=BoardViewController&action=show&project_id=183 2022-01-27 13:02:27 +08:00
Lan Hui 42356c222d templates/mainpage_get.html: remove superfluous () 2022-01-27 12:48:25 +08:00
Lan Hui edb801b95e Show the expiry notice if the account has expired. 2022-01-27 12:45:09 +08:00
Lan Hui 718b98ef02 Login.py: use password instead of psd because psd may cause confusion. 2022-01-27 12:28:41 +08:00
Lan Hui 0c923f7db2 Login.py: simplify md5. 2022-01-27 12:24:20 +08:00
Lan Hui d4c1b1fdcc Login.py: update expiry date. 2022-01-27 11:57:40 +08:00
Lan Hui a94a333366 Remove redundant css files. 2022-01-27 11:49:41 +08:00
Lan Hui 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
Lan Hui b0d80096d6 templates/userpage_get.html: change the position and order of the checkboxes. 2022-01-27 11:27:26 +08:00
Lan Hui 4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ 2022-01-26 21:10:09 +08:00
Hui Lan 246ddcc62a Remove HOME_PAGE as we use URL now. 2021-12-03 09:18:34 +08:00
Hui Lan f8a5cc2a40 test: use localhost to test 2021-12-03 09:16:18 +08:00
Hui Lan 3c118a53e2 add conftest.py 2021-12-03 09:08:45 +08:00
Lan Hui ffc33852ae main.py: make sure the key articleID exists. 2021-09-05 20:51:28 +08:00
Lan Hui 91ca6fe33b Merge branch 'BugFix300' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix300 2021-09-05 20:44:55 +08:00
Hui Lan 02a5d4bd47 main.py: fix bug300: http://118.25.96.118/bugzilla/show_bug.cgi?id=300 2021-09-05 20:42:18 +08:00
Hui Lan 2a509f83cc Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix293 2021-08-31 21:27:37 +08:00
Hui Lan f8acf03acc main.py: let the user have a small chance to get a much more difficult article than his vocabulary level. 2021-08-31 21:25:17 +08:00
mrlan 6754930707 Merge pull request 'BugFix293' (#14) from BugFix293 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/14
 2021-08-30 08:31:56 +08:00
Hui Lan baf333678a main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database 
main.py:

- shuffle the articles first before select one

- relax selection range (see the function call within_range)

build.sh:

- keep the database wordfreqapp.db so that the user could login again next time after the program is rebuilt.

Hui
 2021-08-30 08:18:47 +08:00
Hui Lan 868104da6c main.py: let the range be more flexible. 2021-08-30 07:43:41 +08:00
Lan Hui 5e322f067b requirements.txt includes dependencies of the program. difficulty.py is modified in this fix. Not sure why build.sh is included. 2021-08-20 19:27:44 +08:00
Hui Lan c6b620b272 app/main.py: flash a message after deleting a word (use bootstrap alerts -- it seems that dismissable alert does not work, so forget about it.). 2021-08-02 19:27:22 +08:00