From 4b96b1736872dcb0dec0676269535f3ae6c87733 Mon Sep 17 00:00:00 2001 From: ramforth Date: Tue, 18 Nov 2025 00:53:12 +0100 Subject: [PATCH] css moar correction --- listener_manager.py | 1 + main.py | 17 ++++++++++------- static/css/main.css | 1 - 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/listener_manager.py b/listener_manager.py index 5ee1e3b..41b376f 100644 --- a/listener_manager.py +++ b/listener_manager.py @@ -29,6 +29,7 @@ class ListenerManager: channel_name=user.username, client_id=settings.TWITCH_CLIENT_ID, client_secret=settings.TWITCH_CLIENT_SECRET, + bot_id=user.platform_user_id, websocket_manager=websocket_manager, db_user_id=user.id ) diff --git a/main.py b/main.py index 8a9d94d..9d7ca3e 100644 --- a/main.py +++ b/main.py @@ -59,9 +59,6 @@ async def lifespan(app: FastAPI): app = FastAPI(lifespan=lifespan) -# Configure Jinja2 templates -templates = Jinja2Templates(directory=TEMPLATES_DIR) - # Add session middleware. A secret key is required for signing the session cookie. # We can reuse our encryption key for this, but in production you might want a separate key. app.add_middleware(SessionMiddleware, secret_key=settings.ENCRYPTION_KEY) @@ -73,12 +70,17 @@ app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static") # Add the authentication router app.include_router(auth.router) +# --- Template Dependency --- +def get_templates(): + return Jinja2Templates(directory=TEMPLATES_DIR) + @app.get("/") -async def read_root(request: Request): +async def read_root(request: Request, templates: Jinja2Templates = Depends(get_templates)): return templates.TemplateResponse("login.html", {"request": request}) @app.get("/dashboard") -async def read_dashboard(request: Request, db: Session = Depends(auth.get_db)): +async def read_dashboard(request: Request, db: Session = Depends(auth.get_db), + templates: Jinja2Templates = Depends(get_templates)): # This is our protected route. It checks if a user_id exists in the session. user_id = request.session.get('user_id') if not user_id: @@ -109,11 +111,12 @@ async def logout(request: Request): return RedirectResponse(url="/") @app.get("/help/css") -async def css_help(request: Request): +async def css_help(request: Request, templates: Jinja2Templates = Depends(get_templates)): return templates.TemplateResponse("help_css.html", {"request": request}) @app.get("/overlay/{user_id}") -async def read_overlay(request: Request, user_id: int, theme_override: str = None, db: Session = Depends(auth.get_db)): +async def read_overlay(request: Request, user_id: int, theme_override: str = None, + db: Session = Depends(auth.get_db), templates: Jinja2Templates = Depends(get_templates)): # This endpoint serves the overlay page. user = db.query(models.User).filter(models.User.id == user_id).first() if not user: diff --git a/static/css/main.css b/static/css/main.css index 5910cb9..cd69005 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -287,5 +287,4 @@ pre { white-space: pre-wrap; word-wrap: break-word; font-family: monospace; -} } \ No newline at end of file