Spaces:

cacode
/

cam

Paused

cacode commited on 8 days ago

Commit

4312f62

verified ·

1 Parent(s): 11d8362

Upload 67 files

Files changed (8) hide show

app/__pycache__/main.cpython-313.pyc CHANGED Viewed

Binary files a/app/__pycache__/main.cpython-313.pyc and b/app/__pycache__/main.cpython-313.pyc differ

app/__pycache__/web.cpython-313.pyc CHANGED Viewed

Binary files a/app/__pycache__/web.cpython-313.pyc and b/app/__pycache__/web.cpython-313.pyc differ

app/main.py CHANGED Viewed

@@ -34,7 +34,10 @@ def on_startup() -> None:
 @app.middleware("http")
 async def track_presence(request: Request, call_next):
     response = await call_next(request)
-    if request.url.path.startswith("/static") or request.url.path.startswith("/media"):
         return response
     if request.url.path.startswith("/api"):
         return response
@@ -120,3 +123,4 @@ templates.env.filters["datetime_local"] = format_datetime
 templates.env.filters["duration_human"] = format_timedelta

 @app.middleware("http")
 async def track_presence(request: Request, call_next):
     response = await call_next(request)
+    if request.url.path.startswith("/static"):
+        response.headers["Cache-Control"] = "no-store"
+        return response
+    if request.url.path.startswith("/media"):
         return response
     if request.url.path.startswith("/api"):
         return response
 templates.env.filters["duration_human"] = format_timedelta

app/static/style.css CHANGED Viewed

@@ -1287,3 +1287,67 @@ button {
     width: 100%;
   }
 }

     width: 100%;
   }
 }
+/* Login layout restore */
+.login-body {
+  min-height: 100vh;
+}
+.login-page {
+  width: min(1200px, calc(100% - 32px));
+  min-height: 100vh;
+  margin: 0 auto;
+  padding: 28px 0 44px;
+  display: grid;
+  grid-template-columns: minmax(0, 1.05fr) minmax(360px, 0.95fr);
+  gap: 24px;
+  align-items: stretch;
+}
+.compact-login-page {
+  grid-template-columns: minmax(320px, 0.95fr) minmax(320px, 0.85fr);
+  max-width: 1040px;
+}
+.login-copy,
+.login-panel {
+  padding: 30px;
+}
+.login-copy {
+  display: grid;
+  gap: 18px;
+  align-content: center;
+}
+.login-panel {
+  display: grid;
+  gap: 16px;
+  align-content: start;
+}
+.admin-panel {
+  align-content: center;
+}
+.activity-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+@media (max-width: 980px) {
+  .login-page,
+  .compact-login-page {
+    width: min(100% - 24px, 1200px);
+    padding: 20px 0 36px;
+    grid-template-columns: 1fr;
+  }
+  .login-copy,
+  .login-panel {
+    padding: 24px;
+  }
+}

app/templates/admin_login.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>管理员登录 · {{ app_name }}</title>
-    <link rel="stylesheet" href="/static/style.css" />
   </head>
   <body class="login-body admin-login-body">
     <div class="page-backdrop"></div>
@@ -37,3 +37,4 @@
     </main>
   </body>
 </html>

     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>管理员登录 · {{ app_name }}</title>
+    <link rel="stylesheet" href="/static/style.css?v={{ static_asset_version('style.css') }}" />
   </head>
   <body class="login-body admin-login-body">
     <div class="page-backdrop"></div>
     </main>
   </body>
 </html>

app/templates/base.html CHANGED Viewed

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{ page_title or app_name }} · {{ app_name }}</title>
-    <link rel="icon" href="/static/favicon.ico" sizes="any" />
-    <link rel="stylesheet" href="/static/style.css" />
   </head>
   <body class="{% if admin %}admin-mode{% else %}user-mode{% endif %}">
     <div class="page-backdrop"></div>
@@ -122,3 +122,5 @@

     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{ page_title or app_name }} · {{ app_name }}</title>
+    <link rel="icon" href="/static/favicon.ico?v={{ static_asset_version('favicon.ico') }}" sizes="any" />
+    <link rel="stylesheet" href="/static/style.css?v={{ static_asset_version('style.css') }}" />
   </head>
   <body class="{% if admin %}admin-mode{% else %}user-mode{% endif %}">
     <div class="page-backdrop"></div>

app/templates/login.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>用户登录 · {{ app_name }}</title>
-    <link rel="stylesheet" href="/static/style.css" />
   </head>
   <body class="login-body">
     <div class="page-backdrop"></div>
@@ -42,3 +42,4 @@
     </main>
   </body>
 </html>

     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>用户登录 · {{ app_name }}</title>
+    <link rel="stylesheet" href="/static/style.css?v={{ static_asset_version('style.css') }}" />
   </head>
   <body class="login-body">
     <div class="page-backdrop"></div>
     </main>
   </body>
 </html>

app/web.py CHANGED Viewed

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from datetime import datetime
 from zoneinfo import ZoneInfo
 from fastapi import Request
@@ -11,6 +12,17 @@ from app.config import ROOT_DIR, settings
 templates = Jinja2Templates(directory=str(ROOT_DIR / "app" / "templates"))
 def local_now() -> datetime:
@@ -40,3 +52,5 @@ def render(request: Request, template_name: str, context: dict, status_code: int
 def redirect(url: str, status_code: int = 303) -> RedirectResponse:
     return RedirectResponse(url=url, status_code=status_code)

 from __future__ import annotations
 from datetime import datetime
+from pathlib import Path
 from zoneinfo import ZoneInfo
 from fastapi import Request
 templates = Jinja2Templates(directory=str(ROOT_DIR / "app" / "templates"))
+STATIC_DIR = ROOT_DIR / "app" / "static"
+def static_asset_version(asset_name: str) -> int:
+    asset_path = STATIC_DIR / asset_name
+    if not asset_path.exists():
+        return 1
+    return int(asset_path.stat().st_mtime)
+templates.env.globals["static_asset_version"] = static_asset_version
 def local_now() -> datetime:
 def redirect(url: str, status_code: int = 303) -> RedirectResponse:
     return RedirectResponse(url=url, status_code=status_code)