From 4076e70ce9ca91a492d8b7b1394487c29f1ac5db Mon Sep 17 00:00:00 2001 From: Ehco1996 Date: Tue, 16 Jan 2024 10:15:06 +0800 Subject: [PATCH] chore: introduce djlint --- Makefile | 4 + apps/sspanel/static/sspanel/css/sspanel.css | 29 +- apps/stats/admin.py | 2 +- poetry.lock | 291 +++++++++- pyproject.toml | 1 + templates/404.html | 43 +- templates/adminbase.html | 293 +++++----- templates/base.html | 408 +++++++------ templates/basehead.html | 39 +- templates/footer.html | 23 +- templates/my_admin/announcement_create.html | 62 +- templates/my_admin/announcement_detail.html | 57 +- templates/my_admin/announcements.html | 132 ++--- templates/my_admin/charge.html | 147 +++-- templates/my_admin/good_create.html | 59 +- templates/my_admin/good_detail.html | 58 +- templates/my_admin/goods.html | 142 ++--- templates/my_admin/index.html | 122 ++-- templates/my_admin/invitecode.html | 113 ++-- templates/my_admin/purchasehistory.html | 115 ++-- templates/my_admin/user_status.html | 213 ++++--- .../registration/password_change_done.html | 12 +- .../registration/password_change_form.html | 71 ++- .../registration/password_reset_complete.html | 39 +- .../registration/password_reset_confirm.html | 71 ++- .../registration/password_reset_done.html | 40 +- .../registration/password_reset_form.html | 68 ++- templates/web/aff_invite.html | 116 ++-- templates/web/announcement.html | 71 ++- templates/web/charge_center.html | 274 ++++----- templates/web/help.html | 83 +-- templates/web/index.html | 116 ++-- templates/web/invite.html | 79 ++- templates/web/login.html | 127 ++-- templates/web/node_occupancy.html | 282 +++++---- templates/web/register.html | 76 ++- templates/web/shop.html | 211 ++++--- templates/web/telegram_login.html | 63 +- templates/web/ticket_create.html | 85 +-- templates/web/ticket_edit.html | 137 ++--- templates/web/ticket_list.html | 96 ++-- templates/web/user_info.html | 540 +++++++++--------- templates/web/user_traffic_log.html | 83 +-- 43 files changed, 2649 insertions(+), 2444 deletions(-) diff --git a/Makefile b/Makefile index 1fdc89fcc4..ca2b59d7ae 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,14 @@ update: fmt: autoflake --recursive --remove-all-unused-imports --in-place . && isort . && black . + echo "fmt django templates" + djlint --reformat templates/ + check: isort --check . black --check . + djlint --check templates/ runserver: $(PM) runserver 0.0.0.0:8000 diff --git a/apps/sspanel/static/sspanel/css/sspanel.css b/apps/sspanel/static/sspanel/css/sspanel.css index 9bee0faae2..83ad014049 100644 --- a/apps/sspanel/static/sspanel/css/sspanel.css +++ b/apps/sspanel/static/sspanel/css/sspanel.css @@ -1,33 +1,28 @@ /* 动态为footer添加类fixed-bottom */ .fixed-bottom { - position: fixed; - bottom: 0; - width: 100%; + position: fixed; + bottom: 0; + width: 100%; } - -/* 注册错误消息提示 */ - .errorlist { - color: red + color: red; } - /* Navbar免js自动响应 */ #nav-toggle-state { - display: none; + display: none; } -#nav-toggle-state:checked~.nav-menu { - display: block; +#nav-toggle-state:checked ~ .nav-menu { + display: block; } - @media all and (max-width: 768px) { - body { - /* On modern browsers, prevent the whole page to bounce */ - overflow: hidden; - } -} \ No newline at end of file + body { + /* On modern browsers, prevent the whole page to bounce */ + overflow: hidden; + } +} diff --git a/apps/stats/admin.py b/apps/stats/admin.py index 0a8d8d1ab3..b2d7bea7f2 100644 --- a/apps/stats/admin.py +++ b/apps/stats/admin.py @@ -13,7 +13,7 @@ class DailyStatsAdmin(admin.ModelAdmin): "order_amount", "total_used_traffic", ] - list_per_page = 31 + list_per_page = 10 list_filter = ["date"] diff --git a/poetry.lock b/poetry.lock index 75a4ecdc4e..419ab657cb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -613,6 +613,21 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"] test-randomorder = ["pytest-randomly"] +[[package]] +name = "cssbeautifier" +version = "1.14.11" +description = "CSS unobfuscator and beautifier." +optional = false +python-versions = "*" +files = [ + {file = "cssbeautifier-1.14.11.tar.gz", hash = "sha256:40544c2b62bbcb64caa5e7f37a02df95654e5ce1bcacadac4ca1f3dc89c31513"}, +] + +[package.dependencies] +editorconfig = ">=0.12.2" +jsbeautifier = "*" +six = ">=1.13.0" + [[package]] name = "decorator" version = "5.1.1" @@ -767,6 +782,41 @@ files = [ django = ">=3.0" pytz = "*" +[[package]] +name = "djlint" +version = "1.34.1" +description = "HTML Template Linter and Formatter" +optional = false +python-versions = ">=3.8.0,<4.0.0" +files = [ + {file = "djlint-1.34.1-py3-none-any.whl", hash = "sha256:96ff1c464fb6f061130ebc88663a2ea524d7ec51f4b56221a2b3f0320a3cfce8"}, + {file = "djlint-1.34.1.tar.gz", hash = "sha256:db93fa008d19eaadb0454edf1704931d14469d48508daba2df9941111f408346"}, +] + +[package.dependencies] +click = ">=8.0.1,<9.0.0" +colorama = ">=0.4.4,<0.5.0" +cssbeautifier = ">=1.14.4,<2.0.0" +html-tag-names = ">=0.1.2,<0.2.0" +html-void-elements = ">=0.1.0,<0.2.0" +jsbeautifier = ">=1.14.4,<2.0.0" +json5 = ">=0.9.11,<0.10.0" +pathspec = ">=0.12.0,<0.13.0" +PyYAML = ">=6.0,<7.0" +regex = ">=2023.0.0,<2024.0.0" +tqdm = ">=4.62.2,<5.0.0" + +[[package]] +name = "editorconfig" +version = "0.12.3" +description = "EditorConfig File Locator and Interpreter for Python" +optional = false +python-versions = "*" +files = [ + {file = "EditorConfig-0.12.3-py3-none-any.whl", hash = "sha256:6b0851425aa875b08b16789ee0eeadbd4ab59666e9ebe728e526314c4a2e52c1"}, + {file = "EditorConfig-0.12.3.tar.gz", hash = "sha256:57f8ce78afcba15c8b18d46b5170848c88d56fd38f05c2ec60dbbfcb8996e89e"}, +] + [[package]] name = "executing" version = "2.0.0" @@ -867,6 +917,28 @@ aiohttp = ">=3.6.2,<4.0.0" maxminddb = ">=2.3.0,<3.0.0" requests = ">=2.24.0,<3.0.0" +[[package]] +name = "html-tag-names" +version = "0.1.2" +description = "List of known HTML tag names" +optional = false +python-versions = ">=3.7,<4.0" +files = [ + {file = "html-tag-names-0.1.2.tar.gz", hash = "sha256:04924aca48770f36b5a41c27e4d917062507be05118acb0ba869c97389084297"}, + {file = "html_tag_names-0.1.2-py3-none-any.whl", hash = "sha256:eeb69ef21078486b615241f0393a72b41352c5219ee648e7c61f5632d26f0420"}, +] + +[[package]] +name = "html-void-elements" +version = "0.1.0" +description = "List of HTML void tag names." +optional = false +python-versions = ">=3.7,<4.0" +files = [ + {file = "html-void-elements-0.1.0.tar.gz", hash = "sha256:931b88f84cd606fee0b582c28fcd00e41d7149421fb673e1e1abd2f0c4f231f0"}, + {file = "html_void_elements-0.1.0-py3-none-any.whl", hash = "sha256:784cf39db03cdeb017320d9301009f8f3480f9d7b254d0974272e80e0cb5e0d2"}, +] + [[package]] name = "idna" version = "3.4" @@ -976,6 +1048,34 @@ docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alab qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] testing = ["Django", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] +[[package]] +name = "jsbeautifier" +version = "1.14.11" +description = "JavaScript unobfuscator and beautifier." +optional = false +python-versions = "*" +files = [ + {file = "jsbeautifier-1.14.11.tar.gz", hash = "sha256:6b632581ea60dd1c133cd25a48ad187b4b91f526623c4b0fb5443ef805250505"}, +] + +[package.dependencies] +editorconfig = ">=0.12.2" +six = ">=1.13.0" + +[[package]] +name = "json5" +version = "0.9.14" +description = "A Python implementation of the JSON5 data format." +optional = false +python-versions = "*" +files = [ + {file = "json5-0.9.14-py2.py3-none-any.whl", hash = "sha256:740c7f1b9e584a468dbb2939d8d458db3427f2c93ae2139d05f47e453eae964f"}, + {file = "json5-0.9.14.tar.gz", hash = "sha256:9ed66c3a6ca3510a976a9ef9b8c0787de24802724ab1860bc0153c7fdd589b02"}, +] + +[package.extras] +dev = ["hypothesis"] + [[package]] name = "kombu" version = "5.3.2" @@ -1169,13 +1269,13 @@ testing = ["docopt", "pytest (<6.0.0)"] [[package]] name = "pathspec" -version = "0.11.2" +version = "0.12.1" description = "Utility library for gitignore style pattern matching of file paths." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, - {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, + {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"}, + {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, ] [[package]] @@ -1471,6 +1571,65 @@ files = [ {file = "pytzdata-2020.1.tar.gz", hash = "sha256:3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"}, ] +[[package]] +name = "pyyaml" +version = "6.0.1" +description = "YAML parser and emitter for Python" +optional = false +python-versions = ">=3.6" +files = [ + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, +] + [[package]] name = "redis" version = "3.5.3" @@ -1485,6 +1644,108 @@ files = [ [package.extras] hiredis = ["hiredis (>=0.1.3)"] +[[package]] +name = "regex" +version = "2023.12.25" +description = "Alternative regular expression module, to replace re." +optional = false +python-versions = ">=3.7" +files = [ + {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"}, + {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"}, + {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"}, + {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"}, + {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"}, + {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"}, + {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"}, + {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"}, + {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"}, + {file = "regex-2023.12.25-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39"}, + {file = "regex-2023.12.25-cp37-cp37m-win32.whl", hash = "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c"}, + {file = "regex-2023.12.25-cp37-cp37m-win_amd64.whl", hash = "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2"}, + {file = "regex-2023.12.25-cp38-cp38-win32.whl", hash = "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb"}, + {file = "regex-2023.12.25-cp38-cp38-win_amd64.whl", hash = "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"}, + {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"}, + {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"}, + {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"}, +] + [[package]] name = "requests" version = "2.31.0" @@ -1628,6 +1889,26 @@ files = [ {file = "tomd-0.1.3.tar.gz", hash = "sha256:23f21ae853157be49d163159bc7c6bc007dd5e87b69769ec5ba3e17f5de7a6d4"}, ] +[[package]] +name = "tqdm" +version = "4.66.1" +description = "Fast, Extensible Progress Meter" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tqdm-4.66.1-py3-none-any.whl", hash = "sha256:d302b3c5b53d47bce91fea46679d9c3c6508cf6332229aa1e7d8653723793386"}, + {file = "tqdm-4.66.1.tar.gz", hash = "sha256:d88e651f9db8d8551a62556d3cff9e3034274ca5d66e93197cf2490e2dcb69c7"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[package.extras] +dev = ["pytest (>=6)", "pytest-cov", "pytest-timeout", "pytest-xdist"] +notebook = ["ipywidgets (>=6)"] +slack = ["slack-sdk"] +telegram = ["requests"] + [[package]] name = "traitlets" version = "5.11.2" @@ -1804,4 +2085,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "7fcfd7a30f81a02e7c5149b21a1ba21c262710bd9beca3db46924d04cbc86bc6" +content-hash = "44c50f76bfc5d9d92976485739a78675d6148b76eb49143a0d74f135d8552228" diff --git a/pyproject.toml b/pyproject.toml index c65c752564..c5f5aff209 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ djangorestframework = "^3.14.0" autoflake = "^2.2.1" black = "^23.12.1" isort = "^5.12.0" +djlint = "^1.34.1" [build-system] build-backend = "poetry.core.masonry.api" diff --git a/templates/404.html b/templates/404.html index d68716dfd0..b93e22c58f 100755 --- a/templates/404.html +++ b/templates/404.html @@ -1,10 +1,9 @@ - - - 该页面不存在/需要登录才能访问 - - - - - - -
- -
- - - \ No newline at end of file + + + + +
+ +
+ + diff --git a/templates/adminbase.html b/templates/adminbase.html index b29ed31ad3..f168df36ab 100644 --- a/templates/adminbase.html +++ b/templates/adminbase.html @@ -1,162 +1,153 @@ {% load ehcofilter %} - - - {% load static %} - {% settings_value "SITE_TITLE" %} - {% include "basehead.html" %} - - - - -
- -
-
-

- {% settings_value "SITE_SUBTITLE" %} -

-

- 你说会发现什么呢? -

-
-
-
-
-
-
-
- {% if user.is_authenticated %} - + +
+ +
+
+

{% settings_value "SITE_SUBTITLE" %}

+

你说会发现什么呢?

-
- {% block main %} {% endblock main%} +
+
+
+
+
+
+ {% if user.is_authenticated %} + +
+
+
+ {% block main %} + {% endblock main %} +
-
- -{% include "footer.html" %} - -{% if messages %} - -{% endif %} - - \ No newline at end of file + + {% include "footer.html" %} + + {% if messages %} + + {% endif %} + diff --git a/templates/base.html b/templates/base.html index c455a03088..d16488ca5f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,227 +1,205 @@ -{% load ehcofilter %} - - - {% load static %} - {% settings_value "SITE_TITLE" %} - - - {% include "basehead.html" %} - - - - -
-
-
-

{% settings_value "SITE_SUBTITLE" %}

-

- 你说会发现什么呢? -

-
-
-
-
-
-
-
+ +
+ +
+
+
+

{% settings_value "SITE_SUBTITLE" %}

+

你说会发现什么呢?

- -
- {% block main %} {% endblock main%} +
+
+
+
+
+
+ {% if user.is_authenticated %} + +
+
+
+ {% block main %} + {% endblock main %} +
-
- -{% settings_value "HIDE_FOOTER" as hide_footer %} -{% if not hide_footer %} -{% include "footer.html" %} -{% endif %} - - -{% if messages %} - -{% endif %} - - \ No newline at end of file + + {% settings_value "HIDE_FOOTER" as hide_footer %} + {% if not hide_footer %} + {% include "footer.html" %} + {% endif %} + + {% if messages %} + + {% endif %} + diff --git a/templates/basehead.html b/templates/basehead.html index a3c349e8a5..ce5f1e5456 100644 --- a/templates/basehead.html +++ b/templates/basehead.html @@ -2,32 +2,35 @@ - + {% if user.theme and user.theme != "default" %} - + {% else %} - + {% endif %} - - + {% if not simple_extra_static or user.is_authenticated %} - - - - + + + {% endif %} - - {% if not simple_extra_static or user.is_authenticated %} - - - - - - -{% endif %} \ No newline at end of file + + + + + +{% endif %} diff --git a/templates/footer.html b/templates/footer.html index 567a370dc7..366ecdbdef 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,14 +1,15 @@ {% if simple_extra_static %} -
-
-
-

-

-

+
+
+
+

+

+

+
-
-
+ {% endif %} diff --git a/templates/my_admin/announcement_create.html b/templates/my_admin/announcement_create.html index a79f8a8858..c208e80eda 100644 --- a/templates/my_admin/announcement_create.html +++ b/templates/my_admin/announcement_create.html @@ -1,32 +1,36 @@ -{% extends 'adminbase.html' %} {% block main %} -
-
-
-
-

- 创建新的公告 -

-

- 公告格式采用 - Markdown -

+{% extends 'adminbase.html' %} +{% block main %} +
+
+
+
+

创建新的公告

+

+ 公告格式采用 + Markdown +

+
+
+
+
+
+
+ {% csrf_token %} +
+ +
+
+
+ + 取消 +
+
-
-
-
-
-
- {% csrf_token %} -
- -
-
-
- - 取消 -
-
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/announcement_detail.html b/templates/my_admin/announcement_detail.html index dbad2ddf6f..f19c699fcf 100644 --- a/templates/my_admin/announcement_detail.html +++ b/templates/my_admin/announcement_detail.html @@ -1,32 +1,31 @@ - {% extends 'adminbase.html' %} {% block main %} {% load ehcofilter %} - -
-
-
-
-

- 公告编辑 -

-

- 格式采用Markdown! -

+{% extends 'adminbase.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

公告编辑

+

格式采用Markdown!

+
+
+
+
+
+
+ {% csrf_token %} +
+ +
+
+
+ + 取消修改 +
+
-
-
-
-
-
- {% csrf_token %} -
- -
-
-
- - 取消修改 -
-
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/announcements.html b/templates/my_admin/announcements.html index 5230552d92..8618af800f 100644 --- a/templates/my_admin/announcements.html +++ b/templates/my_admin/announcements.html @@ -1,69 +1,69 @@ -{% extends 'adminbase.html' %} {% block main %} - - -
-
-
-
-

- 公告列表 -

-

- 领导请下放通知! -

-
-
-
-
-
-
- - - - - - - - - - {% for rec in anno %} - - - - - - -
操作ID日期内容
-

- 编辑 -

-

- 删除 -

-
#{{ rec.pk}}{{ rec.time }}{{ rec.body |safe }}
-

- 增加公告 -

+ +
+
+
+ + + + + + + + + + {% for rec in anno %} + + + + + + + + {% empty %} +

没有公告哟

+ {% endfor %} +
操作ID日期内容
+

+ 编辑 +

+

+ 删除 +

+
#{{ rec.pk }}{{ rec.time }}{{ rec.body |safe }}
+

+ 增加公告 +

+
-
- -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/charge.html b/templates/my_admin/charge.html index 700f9bf5da..17c0b67ec7 100644 --- a/templates/my_admin/charge.html +++ b/templates/my_admin/charge.html @@ -1,78 +1,77 @@ -{% extends 'adminbase.html' %} {% block main %} - - -
-
-
-
-

- 充值码列表 -

-

- 添加充值码 -

-
-
-
-
-
- -
-
- {% csrf_token %} -
-
- -
-
- -
-
- +{% extends 'adminbase.html' %} +{% block main %} +
+
+
+
+

充值码列表

+

添加充值码

- +
-
- -
- - - - - - - - - - - {% for contact in contacts %} - - - - - - - - {% empty %} -

没有充值码哟

- {% endfor %} -
ID面值代码状态用户名
#{{ contact.pk}}{{ contact.number }}{{ contact.code }}{{ contact.isused_cn }}{{ contact.user }}
+
+
+
+ {% csrf_token %} +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+ + + + + + + + + + + {% for contact in contacts %} + + + + + + + + {% empty %} +

没有充值码哟

+ {% endfor %} +
ID面值代码状态用户名
#{{ contact.pk }}{{ contact.number }}{{ contact.code }}{{ contact.isused_cn }}{{ contact.user }}
+
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/good_create.html b/templates/my_admin/good_create.html index d357c5f4af..9d3628ad04 100644 --- a/templates/my_admin/good_create.html +++ b/templates/my_admin/good_create.html @@ -1,33 +1,32 @@ - {% extends 'adminbase.html' %} {% block main %} {% load ehcofilter %} - -
-
-
-
-

- 创建新的商品 -

-

- 请在下方填写符合规则的商品信息 -

+{% extends 'adminbase.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

创建新的商品

+

请在下方填写符合规则的商品信息

+
+
+
+
+
+
+ {% csrf_token %} {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} {{ field|add_class:"input" }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+ + 取消 +
+
-
-
-
-
-
- {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} {{ field.label_tag }} {{ field|add_class:"input" }} - {{ field.errors }} {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} {% endfor %} -
-
- - 取消 -
-
-
- -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/good_detail.html b/templates/my_admin/good_detail.html index e2397cf091..dc0363c82b 100644 --- a/templates/my_admin/good_detail.html +++ b/templates/my_admin/good_detail.html @@ -1,32 +1,32 @@ - {% extends 'adminbase.html' %} {% block main %} {% load ehcofilter %} -
-
-
-
-

- 商品编辑 -

-

- 编辑节点:{{ good.name }} -

+{% extends 'adminbase.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

商品编辑

+

编辑节点:{{ good.name }}

+
+
+
+
+
+
+ {% csrf_token %} {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} {{ field|add_class:"input" }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+ + 取消修改 +
+
-
-
-
-
-
- {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} {{ field.label_tag }} {{ field|add_class:"input" }} - {{ field.errors }} {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} {% endfor %} -
-
- - 取消修改 -
-
-
- -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/goods.html b/templates/my_admin/goods.html index c463214d70..239c448609 100644 --- a/templates/my_admin/goods.html +++ b/templates/my_admin/goods.html @@ -1,74 +1,74 @@ -{% extends 'adminbase.html' %} {% block main %} -
-
-
-
-

- 商品列表 -

-

- 添加或者删除商品 -

-
-
-
-
-
-
- - - - - - - - - - - - - {% for good in goods %} - - - - - - - - - -
操作ID商品描述金额流量状态等级
-

- 编辑 -

-

- 删除 -

-
#{{ good.pk }}{{ good.name }}{{ good.money }}{{ good.total_transfer }}{{ good.status_cn }}{{ good.level }}
-

- 增加商品 -

+ +
+
+
+ + + + + + + + + + + + + {% for good in goods %} + + + + + + + + + + + {% empty %} +

暂时没有商品,点击下方按钮添加商品

+ {% endfor %} +
操作ID商品描述金额流量状态等级
+

+ 编辑 +

+

+ 删除 +

+
#{{ good.pk }}{{ good.name }}{{ good.money }}{{ good.total_transfer }}{{ good.status_cn }}{{ good.level }}
+

+ 增加商品 +

+
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/index.html b/templates/my_admin/index.html index 5e1e91f9f0..6e26f72132 100644 --- a/templates/my_admin/index.html +++ b/templates/my_admin/index.html @@ -1,74 +1,69 @@ -{% extends 'adminbase.html' %} {% block main %} - - - - -
-
-
-
-

- 汇总 -

-

- 下面是系统运行状态简报 -

-
-
-
-
- -
-
-
-
-
- +{% extends 'adminbase.html' %} +{% block main %} + + + +
+
+
+
+

汇总

+

下面是系统运行状态简报

+
-

- -

-

- - 查询 - -

-
+
-
-
-
- -
-
- -
-
- +
+
+
+
+ +
+

+ +

+

+ 查询 +

+
-
-
- -
-
- +
+
+
+ +
+
+ +
+
+ +
-
-
-
- +
+
+ +
+
+ +
-
- +
+
+ +
+
+ +
+
- -
- - - {% endblock main %} \ No newline at end of file + +{% endblock main %} diff --git a/templates/my_admin/invitecode.html b/templates/my_admin/invitecode.html index d085634212..336b9696f8 100644 --- a/templates/my_admin/invitecode.html +++ b/templates/my_admin/invitecode.html @@ -1,63 +1,60 @@ -{% extends 'adminbase.html' %} {% block main %} {% load ehcofilter %} -
-
-
-
-

- 邀请码管理 -

-

- 添加邀请码... -

-
-
-
-
-
-
-
- {% csrf_token %} -
-
- -
-
-
- -
-
-
- +{% extends 'adminbase.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

邀请码管理

+

添加邀请码...

- +
-
-

不公开显示的邀请码列表

-
- - - - - - - - - {% for code in code_list %} - - - - - - {% empty %} -

没有私密的邀请码

- {% endfor %} -
类型代码创建时间
{{ code.get_code_type_display }}{{ code.code }}{{ code.created_at }}
+
+
+
+ {% csrf_token %} +
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+

不公开显示的邀请码列表

+
+ + + + + + + + + {% for code in code_list %} + + + + + + {% empty %} +

没有私密的邀请码

+ {% endfor %} +
类型代码创建时间
{{ code.get_code_type_display }}{{ code.code }}{{ code.created_at }}
+
-
- -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/purchasehistory.html b/templates/my_admin/purchasehistory.html index 5aa40f88ed..c0a2f916f9 100644 --- a/templates/my_admin/purchasehistory.html +++ b/templates/my_admin/purchasehistory.html @@ -1,60 +1,61 @@ - {% extends 'adminbase.html' %} {% block main %} -
-
-
-
-

- 购买记录列表 -

-

- 都在这里了,看吧! -

+{% extends 'adminbase.html' %} +{% block main %} +
+
+
+
+

购买记录列表

+

都在这里了,看吧!

+
+
+
+
+
+ +
+ + + + + + + + + + + {% for contact in contacts %} + + + + + + + + {% empty %} +

暂时还没有人购买

+ {% endfor %} +
ID商品名用户名价格购买时间
#{{ contact.pk }}{{ contact.good_name }}{{ contact.user }}{{ contact.money }} 元{{ contact.created_at }}
-
-
- -
-
- -
- - - - - - - - - - - {% for contact in contacts %} - - - - - - - - {% empty %} -

暂时还没有人购买

- {% endfor %} -
ID商品名用户名价格购买时间
#{{ contact.pk}}{{ contact.good_name }}{{ contact.user }}{{ contact.money }} 元{{ contact.created_at }}
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/my_admin/user_status.html b/templates/my_admin/user_status.html index d9aec77dab..d9695e72f8 100644 --- a/templates/my_admin/user_status.html +++ b/templates/my_admin/user_status.html @@ -1,121 +1,112 @@ -{% extends 'adminbase.html' %} {% block main %} -
-
-
-
-

- 用户分析 -

-

- 站内最大土豪即将揭晓! -

+{% extends 'adminbase.html' %} +{% block main %} +
+
+
+
+

用户分析

+

站内最大土豪即将揭晓!

+
-
-
-
-
-
-
-
-

{{ total_user_num }}

-

用户总数

-
-
-
-
-

{{ alive_user_count }}

-

在线人数

-
-
-
-
-

{{ today_checked_user_count }}

-

今日签到

-
-
-
-
-

{{ today_register_user_count }}

-

今日注册

-
-
+
-
-
-
-
-
- 流量排行榜 -
+
+
+
+
+

{{ total_user_num }}

+

用户总数

- - - - - - - - - {% for u in traffic_users %} - - - - - {% endfor %} - -
用户名流量
{{ u.username }}{{ u.human_used_traffic }}
-
-
-
-
-
- 土豪排行榜 -
+
+
+

{{ alive_user_count }}

+

在线人数

- - - - - - - - - {% for u in rich_users_data %} - - - - - {% endfor %} - -
用户名金额
{{ u.user__username }}{{ u.amount }} 元
-
-
-
-
-
- 今日注册 -
+
+
+

{{ today_checked_user_count }}

+

今日签到

- - - - - - - - - {% for u in today_register_user %} - - - - - {% endfor %} - -
用户名邀请人
{{ u.username }}{{ u.inviter }}
+
+
+
+

{{ today_register_user_count }}

+

今日注册

+
+
+
+
+
+
+
+
流量排行榜
+
+ + + + + + + + + {% for u in traffic_users %} + + + + + {% endfor %} + +
用户名流量
{{ u.username }}{{ u.human_used_traffic }}
+
+
+
+
+
+
土豪排行榜
+
+ + + + + + + + + {% for u in rich_users_data %} + + + + + {% endfor %} + +
用户名金额
{{ u.user__username }}{{ u.amount }} 元
+
+
+
+
+
+
今日注册
+
+ + + + + + + + + {% for u in today_register_user %} + + + + + {% endfor %} + +
用户名邀请人
{{ u.username }}{{ u.inviter }}
+
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html index 08d801bbc5..8ea7efb958 100644 --- a/templates/registration/password_change_done.html +++ b/templates/registration/password_change_done.html @@ -1,11 +1,13 @@ {% extends "base.html" %} {% block main %}
-
-
-

密码改成功!

- 点我返回用户中心 +
+
+

密码改成功!

+ 点我返回用户中心 +
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index b15eeb8e39..6e3e5173e3 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -1,42 +1,35 @@ -{% extends 'base.html' %} {% block main %} -{% load ehcofilter %} - -
-
-
-
-

- 修改密码: -

-

- 要好好记住喔.... -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

修改密码:

+

要好好记住喔....

+
+
+
+
+
+

密码修改:

+
+ {% csrf_token %} + {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} + {{ field|add_class:"input is-info" }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+ + 取消修改 +
+
-
-
-
-
-

密码修改:

-
- {% csrf_token %} - {{ form.non_field_errors }} - {% for field in form %} - {{ field.label_tag }} - {{ field|add_class:"input is-info" }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} -
-
- - 取消修改 -
-
-
- - -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html index befa462794..951763bb32 100644 --- a/templates/registration/password_reset_complete.html +++ b/templates/registration/password_reset_complete.html @@ -1,23 +1,22 @@ -{% extends 'base.html' %} {% block main %} {% load ehcofilter %} - -
-
-
-
-

- 新密码设置成功了 -

-

- 这次要好好记住喔.... -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

新密码设置成功了

+

这次要好好记住喔....

+
-
-
-
-
-
-

密码重置成功!!

- 点我返回登录界面 + +
+
+
+

密码重置成功!!

+ 点我返回登录界面 +
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index 0f228f0346..1396ee4305 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -1,42 +1,35 @@ -{% extends 'base.html' %} {% block main %} -{% load ehcofilter %} - -
-
-
-
-

- 重置密码: -

-

- 这次要好好记住喔.... -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

重置密码:

+

这次要好好记住喔....

+
+
+
+
+
+

设置新的密码:

+
+ {% csrf_token %} + {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} + {{ field|add_class:"input is-info" }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+ + 取消修改 +
+
-
-
-
-
-

设置新的密码:

-
- {% csrf_token %} - {{ form.non_field_errors }} - {% for field in form %} - {{ field.label_tag }} - {{ field|add_class:"input is-info" }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} -
-
- - 取消修改 -
-
-
- - -{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html index b9acca211f..3e6227316f 100644 --- a/templates/registration/password_reset_done.html +++ b/templates/registration/password_reset_done.html @@ -1,23 +1,22 @@ -{% extends 'base.html' %} {% block main %} {% load ehcofilter %} - -
-
-
-
-

- 邮件发送通知: -

-

- 没收到的话请检查垃圾箱 -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

邮件发送通知:

+

没收到的话请检查垃圾箱

+
-
-
-
-
-
-

如果您输入的邮箱是正确的话,那么密码重置邮件已经送了!

- 点我返回登录界面 + +
+
+
+

如果您输入的邮箱是正确的话,那么密码重置邮件已经送了!

+ 点我返回登录界面 +
@@ -45,5 +44,4 @@

- - {% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index b85cbfd411..d865595804 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -1,39 +1,35 @@ -{% extends 'base.html' %} {% block main %} -{% load ehcofilter %} -
-
-
-
-

- 重置密码: -

-

- 这次要好好记住喔.... -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

重置密码:

+

这次要好好记住喔....

+
+
+
+
+
+

请输入注册邮箱:

+
+ {% csrf_token %} + {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} + {{ field|add_class:"input is-info" }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+ + 想起来了? +
+
-
-
-
-
-

请输入注册邮箱:

-
- {% csrf_token %} - {{ form.non_field_errors }} - {% for field in form %} - {{ field.label_tag }} - {{ field|add_class:"input is-info" }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} -
-
- - 想起来了? -
-
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/aff_invite.html b/templates/web/aff_invite.html index 5d8b2ad7d7..585405110e 100644 --- a/templates/web/aff_invite.html +++ b/templates/web/aff_invite.html @@ -1,65 +1,66 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 我的推广 -

-

- 每当通过你的邀请链接注册的用户消费一笔 -

你就能获得{{ invite_percent }}%的返利哟! +{% extends 'base.html' %} +{% block main %} +

+
+
+
+

我的推广

+

+ 每当通过你的邀请链接注册的用户消费一笔 +

+ 你就能获得{{ invite_percent }}%的返利哟! +

+

+
+
+
+
+
+
+
+

我的邀请链接:

+
+

+ +

+

+ + +

-

+
+
- -
-
-
-
-

我的邀请链接:

-
-

- -

-

- - - -

+
+ +
+
+ + + + + + + + + {% for log in rebate_logs %} + + + + + + {% endfor %} +
购买人返利金额购买时间
{{ log.consumer_username }}{{ log.money }}元{{ log.created_at }}
- -
-
- - -
- -
-
- - - - - - - - - {% for log in rebate_logs %} - - - - - - {% endfor %} -
购买人返利金额购买时间
{{ log.consumer_username }}{{ log.money }}元{{ log.created_at }}
- -
- {% endblock main %} \ No newline at end of file + +{% endblock main %} diff --git a/templates/web/announcement.html b/templates/web/announcement.html index 697a07d62e..9853f54509 100644 --- a/templates/web/announcement.html +++ b/templates/web/announcement.html @@ -1,40 +1,37 @@ -{% extends 'base.html' %} {% block main %} -
-
-
-
-

- 公告列表 -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

公告列表

+
+
+
+
+
+
+
+

公告记录:

+ + + + + + + + + {% for record in anno %} + + + + + + {% empty %} +

暂时还没发出公告

+ {% endfor %} +
ID时间内容
#{{ record.pk }}{{ record.time }}{{ record.body |safe }}
-
-
-
-
-
-
-

公告记录:

- - - - - - - - - {% for record in anno %} - - - - - - {% empty %} -

- 暂时还没发出公告 -

- {% endfor %} -
ID时间内容
#{{ record.pk }}{{ record.time }}{{ record.body |safe }}
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/charge_center.html b/templates/web/charge_center.html index b51f3d04cb..e97b2a7f4d 100644 --- a/templates/web/charge_center.html +++ b/templates/web/charge_center.html @@ -1,151 +1,158 @@ -{% extends 'base.html' %} {% block main %}{% load static %} {% load ehcofilter %} -
-
-
-
-

- 捐赠充值 -

-

- 捐赠的钱会自动打进你的账号余额.... -

+{% extends 'base.html' %} +{% block main %} + {% load static %} + {% load ehcofilter %} +
+
+
+
+

捐赠充值

+

捐赠的钱会自动打进你的账号余额....

+
-
-
-
-
- -
- -
-
-
- {% settings_value "USE_ALIPAY" as use_alipay %} - {% if use_alipay %} -
-

请在下方输入 - 捐赠金额 -

-

点击捐赠会弹出 - 支付宝二维码 -
支付完成后你的账户里会增加对应的金额 -

- 付完款之后要按红色的确认按钮 -
-
-
-
-
- + +
+
+
+
+ {% settings_value "USE_ALIPAY" as use_alipay %} + {% if use_alipay %} +
+

+ 请在下方输入 + 捐赠金额 +

+

+ 点击捐赠会弹出 + 支付宝二维码 +
+ 支付完成后你的账户里会增加对应的金额 +

+ 付完款之后要按红色的确认按钮 +
+
+
+
+
+ +
+
+ +
+
+

+ +

-
- +
-

- -

- + {% endif %}
- {% else %} -
-

本站通过充值码进行充值:

-
-

扫描站长支付宝PY获得充值码:

-
- -
+
+
+
+ + + + + + + + {% for donate in donatelist %} + + + + + {% endfor %} +
捐赠人捐赠金额
{{ donate.user|mix_name:donate.user }}{{ donate.money }} 元
+
+
- {% endif %}
-
-
-
- - - - - - - - {% for donate in donatelist %} + +
+
+
+

+ {% csrf_token %} + +

+

+ +

+ +
+

用过的充值码:

+
捐赠人捐赠金额
+ - - + + + - {% endfor %} -
{{ donate.user|mix_name:donate.user }}{{ donate.money }} 元时间代码金额
-
+ + {% for code in codelist %} + + {{ code.time|date:"m月d日" }} + {{ code.code }} + {{ code.number }} + + {% empty %} + {% endfor %} +
-
- - -
-
-
-

- {% csrf_token %} - -

-

- -

-
- -
-

用过的充值码:

- - - - - - - - - {% for code in codelist %} - - - - - - {% empty %} - {% endfor %} -
时间代码金额
{{ code.time|date:"m月d日" }}{{ code.code }}{{ code.number }}
-
-
-
- - - - -{% endblock main %} \ No newline at end of file + +{% endblock main %} diff --git a/templates/web/help.html b/templates/web/help.html index 1864f11853..25e3f97a0f 100644 --- a/templates/web/help.html +++ b/templates/web/help.html @@ -1,40 +1,49 @@ -{% extends 'base.html' %} {% block main %} -
-
-
-
-

- 说个故事 -

-

- 一个男孩和「墙」的故事: -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

说个故事

+

一个男孩和「墙」的故事:

+
+
+
+
+
+
+
+ +

+ 一堵墙。 +
+
+

+

+ 男人看着这堵墙,从他还是个男孩的时候,到下巴上冒出细细的胡须, +
+ 又到成为一个真正的男人。墙也从最坚固的样子慢慢衰颓。 +

+

这次一定要征服它,一定可以「征服」它。男人心想。

+

说来也奇怪,小时候与小伙伴玩闹,打赌谁能爬上这堵墙,男孩就从没赢过。不管用怎样的方法,甚至把家里的梯子搬出来,也没能成功爬上去,一次也没有。

+

+ 久而久之,这堵墙成了男孩的心结,即使成年后,只要站在这堵墙前, +
+ 就仍然是那个四五岁不服输的小男孩。 +

+

+ 男人开始攀爬,这么多年来,他已经对墙砖的位置烂熟于心。 +
+ 哪一块砖微微凸出来,可以抓住或者作为落脚的地方, +
+ 男人都了然于心。但他不明白为什么总是在最接近墙头的时候失败。 +

+

这次能够成功吗?

+
+
+ +

注册了你就知道了 ʘʚʘ

-
-
-
-
-
-
- -

一堵墙。 -
-

-

男人看着这堵墙,从他还是个男孩的时候,到下巴上冒出细细的胡须, -
又到成为一个真正的男人。墙也从最坚固的样子慢慢衰颓。

-

这次一定要征服它,一定可以「征服」它。男人心想。

-

说来也奇怪,小时候与小伙伴玩闹,打赌谁能爬上这堵墙,男孩就从没赢过。不管用怎样的方法,甚至把家里的梯子搬出来,也没能成功爬上去,一次也没有。

-

久而久之,这堵墙成了男孩的心结,即使成年后,只要站在这堵墙前, -
就仍然是那个四五岁不服输的小男孩。

-

男人开始攀爬,这么多年来,他已经对墙砖的位置烂熟于心。 -
哪一块砖微微凸出来,可以抓住或者作为落脚的地方, -
男人都了然于心。但他不明白为什么总是在最接近墙头的时候失败。

-

这次能够成功吗?

-
-
- -

注册了你就知道了 ʘʚʘ

-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/index.html b/templates/web/index.html index 84a8b22fc7..328b0fb915 100644 --- a/templates/web/index.html +++ b/templates/web/index.html @@ -1,59 +1,69 @@ -{% extends 'base.html' %} {% load ehcofilter %}{% block main %} -
-
-
- -

- 好像发现了一个 -
-
了不得的地方! -

+{% extends 'base.html' %} +{% load ehcofilter %} +{% block main %} +
+
+
+ +

+ 好像发现了一个 +
+
+ 了不得的地方! +

+
-
-
-
- -

- 是啊是啊! -
-
要进去瞧瞧么?

+
+
+ +

+ 是啊是啊! +
+
+ 要进去瞧瞧么? +

+
-
-
- -
-
{% if user.is_authenticated %} -
-

欢迎小主: {{ user.username }}

-

点击下方按钮进入用户中心

- - -
-{% else %} -
- {% settings_value "ALLOW_REGISTER" as allow_register %} - {% if allow_register is True %} -

注册注册

-

没有账号?快去注册一个吧!

- 注册 +
+ {% if user.is_authenticated %} +
+

欢迎小主: {{ user.username }}

+

点击下方按钮进入用户中心

+ +
{% else %} -

抱歉抱歉!

-

暂时关闭注册了呢~

+
+ {% settings_value "ALLOW_REGISTER" as allow_register %} + {% if allow_register is True %} +

注册注册

+

没有账号?快去注册一个吧!

+ 注册 + {% else %} +

抱歉抱歉!

+

暂时关闭注册了呢~

+ {% endif %} +
+
+
+

登录登录!

+

有账号了?登录吧少年!

+ 登录 +
+
{% endif %} -
-
-
-

登录登录!

-

有账号了?登录吧少年!

- 登录 -
-
{% endif %} {% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/invite.html b/templates/web/invite.html index 12b320e012..248671c80f 100644 --- a/templates/web/invite.html +++ b/templates/web/invite.html @@ -1,45 +1,40 @@ -{% extends 'base.html' %} {% block main %} {% load ehcofilter %} -
-
-
-
-

- 邀请码列表 -

-

- {% settings_value "INVITEINFO" %} -

+{% extends 'base.html' %} +{% block main %} + {% load ehcofilter %} +
+
+
+
+

邀请码列表

+

{% settings_value "INVITEINFO" %}

+
+
+
+
+
+
+
+ + + + + + + + {% for code in code_list %} + + + + + {% empty %} +

哦哦哦,用完了!

+ {% endfor %} +
创建时间邀请码
{{ code.created_at|date:"m月d日" }} + + {{ code.code }} + +
-
-
-
-
-
-
- - - - - - - - - {% for code in code_list %} - - - - - {% empty %} -

- 哦哦哦,用完了! -

- {% endfor %} -
创建时间邀请码
{{ code.created_at|date:"m月d日" }} - - {{ code.code }} - -
-
-{% endblock main%} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/login.html b/templates/web/login.html index bf635dce36..9852dcabef 100644 --- a/templates/web/login.html +++ b/templates/web/login.html @@ -1,67 +1,68 @@ -{% extends 'base.html' %} {% load ehcofilter %} +{% extends 'base.html' %} +{% load ehcofilter %} {% block main %} -
-
-
-
-

- 登录 -

-

- 请问需要加点咖啡吗? -

+
+
+
+
+

登录

+

请问需要加点咖啡吗?

+
-
-
-
-
- {% if user.is_authenticated %} -
-

欢迎小主: {{ user.username }}

-

点击下方按钮进入用户中心

- +
- {% else %} -
-

登录:

-
- {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} {{ field.label_tag }} {{ field }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} {% endfor %} -
-
-

- -

- - {% settings_value "TELEGRAM_BOT_NAME" as tg_bot_name %} - {% settings_value "TELEGRAM_LOGIN_REDIRECT_URL" as tg_redirect_url %} - {% if tg_bot_name and request.get_host in tg_redirect_url %} -

- -

- {% endif %} - - {% settings_value "USE_SMTP" as use_smtp %} - {% if use_smtp %} -

- 忘记密码 -

- {% endif %} - {% settings_value "ALLOW_REGISTER" as allow_register %} - {% if allow_register is True %} -

- 注册一个 -

- {% endif %} +
+ {% if user.is_authenticated %} +
+

欢迎小主: {{ user.username }}

+

点击下方按钮进入用户中心

+
- -
-
-{% endif %} {% endblock main %} \ No newline at end of file + {% else %} +
+

登录:

+
+ {% csrf_token %} {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} {{ field }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+

+ +

+ {% settings_value "TELEGRAM_BOT_NAME" as tg_bot_name %} + {% settings_value "TELEGRAM_LOGIN_REDIRECT_URL" as tg_redirect_url %} + {% if tg_bot_name and request.get_host in tg_redirect_url %} +

+ +

+ {% endif %} + {% settings_value "USE_SMTP" as use_smtp %} + {% if use_smtp %} +

+ 忘记密码 +

+ {% endif %} + {% settings_value "ALLOW_REGISTER" as allow_register %} + {% if allow_register is True %} +

+ 注册一个 +

+ {% endif %} +
+
+
+
+ {% endif %} +{% endblock main %} diff --git a/templates/web/node_occupancy.html b/templates/web/node_occupancy.html index 25d0d5184c..23fc09fa6d 100644 --- a/templates/web/node_occupancy.html +++ b/templates/web/node_occupancy.html @@ -1,156 +1,144 @@ {% extends 'base.html' %} - {% block main %} - -
-
-
-
-

- 独享节点 -

-

- 受够了和别人共享节点?来买一个独享节点吧 :) -

-
-
-
-
- -
- - - - -
-

可购买

-
- {% for node in purchasable_proxy_nodes %} -
-
{{ node.name }}
-
- {{node.occupancy_config.occupancy_price}}/月 +
+
+

余额:

+

{{ user.balance }}

-
-
类型: - {{ node.node_type }} -
-
地区:{{ node.country }} - - - -
-
月流量:{{ node.occupancy_config.human_occupancy_traffic }}
-
备注:{{ node.occupancy_config.remark }}
+
+ +
+

可购买

+
+ {% for node in purchasable_proxy_nodes %} +
+
{{ node.name }}
+
+ + {{ node.occupancy_config.occupancy_price }}/月 +
+
+
+ 类型: + {{ node.node_type }} +
+
+ 地区:{{ node.country }} + + + +
+
月流量:{{ node.occupancy_config.human_occupancy_traffic }}
+
备注:{{ node.occupancy_config.remark }}
+
+
+ {% csrf_token %} + + +
+
+ {% empty %} +

被富哥买完啦,请发工单联系站长补货...

+ {% endfor %}
-
- {% csrf_token %} - - -
- {% empty %} -

被富哥买完啦,请发工单联系站长补货...

- {% endfor %} +
-
- - - - -
- - -{% endblock main %} \ No newline at end of file + + {% endblock main %} diff --git a/templates/web/register.html b/templates/web/register.html index d767880280..0cb320e493 100644 --- a/templates/web/register.html +++ b/templates/web/register.html @@ -1,44 +1,38 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 注册 -

-

- 没有邀请码?点击这里碰碰运气 -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

注册

+

+ 没有邀请码?点击这里碰碰运气 +

+
+
+
+
+
+

注册:

+
+ {% csrf_token %} + {% for field in form %} + {% if field.label != 'not show' %}{{ field.label }}{% endif %} + {{ field }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+

+ +

+

+ 刚注册过了? +

+
+
-
-
-
-
-

注册:

-
- {% csrf_token %} - {% for field in form %} - {% if field.label != 'not show' %} - {{ field.label }} - {% endif %} - {{ field }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} -
-
-

- -

-

- 刚注册过了? -

-
-
-
-{% endblock main%} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/shop.html b/templates/web/shop.html index 652e341e9c..97bb6b7a59 100644 --- a/templates/web/shop.html +++ b/templates/web/shop.html @@ -1,118 +1,108 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 共享节点 -

-

- 量大管饱,便宜实惠, 不容错过 -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

共享节点

+

量大管饱,便宜实惠, 不容错过

+
-
-
-
-
- - -
- {% for good in goods %} - - -
-
{{ good.name }}
-
- {{good.money}}/{{ good.days }}天 -
-
-
流量:{{ good.total_transfer }}
-
有效期:{{ good.days }}天
+ +
+
+
- -
-
-

购买记录

- - - - - - - - - - {% for record in records %} - - - - - - + +
+ {% for good in goods %} + +
+
{{ good.name }}
+
+ + {{ good.money }}/{{ good.days }}天 +
+
+
流量:{{ good.total_transfer }}
+
有效期:{{ good.days }}天
+
+ +
{% empty %} -

- 还没有买过东西呢.... -

+

暂时没有共享节点,请发工单联系站长补货...

{% endfor %} -
ID名称金额时间
#{{ record.pk }}{{ record.good_name }}{{ record.money }}{{ record.created_at}}
+
+
+
+

购买记录

+ + + + + + + + + + {% for record in records %} + + + + + + + {% empty %} +

还没有买过东西呢....

+ {% endfor %} +
ID名称金额时间
#{{ record.pk }}{{ record.good_name }}{{ record.money }}{{ record.created_at }}
+
+
-
- -
- - {% endblock main %} \ No newline at end of file + + {% endblock main %} diff --git a/templates/web/telegram_login.html b/templates/web/telegram_login.html index 7617ea9907..1b186b3109 100644 --- a/templates/web/telegram_login.html +++ b/templates/web/telegram_login.html @@ -1,33 +1,32 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 第一次需要绑定 Telegram 账号 -

-

- 绑定操作只需要执行一次 -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

第一次需要绑定 Telegram 账号

+

绑定操作只需要执行一次

+
+
+
+
+
+
+ {% csrf_token %} {{ form.non_field_errors }} + {% for field in form %} + {{ field.label_tag }} {{ field }} + {{ field.errors }} + {% if field.help_text %}

{{ field.help_text|safe }}

{% endif %} + {% endfor %} +
+
+

+ +

+
+
-
-
-
-
-
- {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} {{ field.label_tag }} {{ field }} - {{ field.errors }} - {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} {% endfor %} -
-
-

- -

-
-
-
-
-{% endblock main%} \ No newline at end of file +
+ {% endblock main %} diff --git a/templates/web/ticket_create.html b/templates/web/ticket_create.html index 180552e004..3ea77a2804 100644 --- a/templates/web/ticket_create.html +++ b/templates/web/ticket_create.html @@ -1,48 +1,49 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 提交新工单 -

-
-
-
-
- -
-
-
- {% csrf_token %} - -
- -
- +{% extends 'base.html' %} +{% block main %} +
+
+
+
+

提交新工单

- -
- -
- +
+
+
+
+ + {% csrf_token %} +
+ +
+ +
-
- -
-
- +
+ +
+ +
- -
- 取消 +
+
+ +
+
+ 取消 +
-
- - + +
-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/ticket_edit.html b/templates/web/ticket_edit.html index bdb07a0fb5..12d737e737 100644 --- a/templates/web/ticket_edit.html +++ b/templates/web/ticket_edit.html @@ -1,86 +1,75 @@ -{% extends 'base.html' %} {% block main %} - - - - -
-
-
-
-

- 工单详情 -

+ +
+
+
+
+

工单详情

+
-
-
-
- -
- -
-
-

标题:{{ ticket.title }}

-
-
-
- + +
+
+ +
+
+

标题:{{ ticket.title }}

-
-
-
- -
- -
- {% for message in ticket_messages %} - {% if message.is_staff %} -
-
-

{{ message.message }}

-
+
+
+ +
+ {% for message in ticket_messages %} + {% if message.is_staff %} +
+
+

{{ message.message }}

+ +
+
+ {% else %} +
+
+

{{ message.message }}

+ +
+
+ {% endif %} + {% endfor %}
- {% else %} -
-
-

{{ message.message }}

- +
+ +
+ {% csrf_token %} +
+ +
+
-
- {% endif %} - {% endfor %} -
-
- -
- - - {% csrf_token %} -
- -
- +
+ +
-
- -
- - -
- - -
- - - -{% endblock main %} \ No newline at end of file + +
+{% endblock main %} diff --git a/templates/web/ticket_list.html b/templates/web/ticket_list.html index 9b5ed6cb9b..daf6a9213c 100644 --- a/templates/web/ticket_list.html +++ b/templates/web/ticket_list.html @@ -1,52 +1,50 @@ -{% extends 'base.html' %} {% block main %} - -
-
-
-
-

- 工单系统 -

-

- 3 天无更新的工单将自动关闭 ... -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

工单系统

+

3 天无更新的工单将自动关闭 ...

+
+
+
+
+
+
+
+

我的工单:

+ + + + + + + + + + {% for record in ticket %} + + + + + + + {% empty %} +

暂时还没提过工单呢

+ {% endfor %} +
操作标题状态更新时间
+ 查看 +
+ 删除 +
{{ record.title }}{{ record.status_with_message_count }}{{ record.updated_at }}
+

+ 发起工单 +

-
-
-
- -
-
-
-

我的工单:

- - - - - - - - - - - {% for record in ticket %} - - - - - - - {% empty %} -

- 暂时还没提过工单呢 -

- {% endfor %} -
操作标题状态更新时间
查看
- 删除 -
{{ record.title }}{{ record.status_with_message_count }}{{ record.updated_at }}
-

发起工单 -

-
-{% endblock main %} \ No newline at end of file +{% endblock main %} diff --git a/templates/web/user_info.html b/templates/web/user_info.html index 87f945de89..90d9d3faef 100644 --- a/templates/web/user_info.html +++ b/templates/web/user_info.html @@ -1,312 +1,315 @@ -{% extends 'base.html' %} {% block main %} -
-
-
-
-

- 用户中心 -

+{% extends 'base.html' %} +{% block main %} +
+
+
+
+

用户中心

+
-
-
-
-
-
- -
-
-

- - - 欢迎小主: {{ user.username }} -

- - -
-
-
-
- -
-
- -
-
-

- + +

+
+
+
+
+

+ + + 欢迎小主: {{ user.username }}

-
-
-
- -
- + + +
+
+
+
+ +
+
+ +
+

+ +

-

- -

-
-
-
- {% if user.today_is_checkin %} -

今天已经签到过了ಠ౪ಠ

- {% else %} -

今天还没有签到,点一下可以获得{{ min_traffic }}~{{ max_traffic }}流量

-
- - {% endif %} -
-
- -
-
-
-

最新公告

+
+
+ +
+ +
+
+

+ +

-
- {% if anno %} {{ anno.body | safe }} {% else %} -

暂无公告

+
+
+ {% if user.today_is_checkin %} +

今天已经签到过了ಠ౪ಠ

+ {% else %} +

今天还没有签到,点一下可以获得{{ min_traffic }}~{{ max_traffic }}流量

+
+ {% endif %}
-
-
-
- -
- - -
-
-

订阅地址

-

导入订阅地址到您的应用以完成订阅

- -
-
-
- - - - 1. 选择协议 -
- - - +
+
+
+

订阅地址

+

导入订阅地址到您的应用以完成订阅

-
-
- - - - 2. 选择客户端 -
- -
- - -
-
-
- - {% endblock main %} \ No newline at end of file + + {% endblock main %} diff --git a/templates/web/user_traffic_log.html b/templates/web/user_traffic_log.html index 4703d2b2e6..afad158bc0 100644 --- a/templates/web/user_traffic_log.html +++ b/templates/web/user_traffic_log.html @@ -1,50 +1,50 @@ -{% extends 'base.html' %} {% block main %} -
-
-
-
-

- 流量记录 -

-
-
-
-
-
- -
-

选择节点获取流量记录:

-
-
-
- +
+
+

使用流量:

+

{{ user.human_used_traffic }}

-
- + +
+

选择节点获取流量记录:

+
+
+
+ +
+
+
+ +
+
-
-
- {% endblock main %} \ No newline at end of file + +{% endblock main %}