chore: introduce djlint

Ehco1996 · Jan 16, 2024 · 4076e70 · 4076e70
1 parent 73d3886
commit 4076e70
Show file tree

Hide file tree

Showing 43 changed files with 2,649 additions and 2,444 deletions.
diff --git 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
@@ -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;
-    }
-}
+  body {
+    /* On modern browsers, prevent the whole page to bounce */
+    overflow: hidden;
+  }
+}
diff --git 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
diff --git 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
@@ -1,10 +1,9 @@
 <!DOCTYPE htmlL>
 <html>
-
-<head>
-	<title>该页面不存在/需要登录才能访问</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<style type="text/css">
+    <head>
+        <title>该页面不存在/需要登录才能访问</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <style type="text/css">
 		body {
 			font-family: 'Courgette', cursive;
 		}
@@ -53,20 +52,20 @@
 			-moz-border-radius: .1em;
 			-border-radius: .1em;
 		}
-	</style>
-</head>
-
-
-<body>
-	<div class="wrap">
-		<div class="logo">
-			<h1>404</h1>
-			<p>你访问的页面不存在/需要登录后才能访问</p>
-			<div class="sub">
-				<p><a href="/">回到首页</a></p>
-			</div>
-		</div>
-	</div>
-</body>
-
-</html>
+
+        </style>
+    </head>
+    <body>
+        <div class="wrap">
+            <div class="logo">
+                <h1>404</h1>
+                <p>你访问的页面不存在/需要登录后才能访问</p>
+                <div class="sub">
+                    <p>
+                        <a href="/">回到首页</a>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>