From 5dc264e08253c3a97ea41d1fde5fbf3f33dd6591 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sat, 24 Aug 2024 13:03:50 -0700 Subject: bring in jQuery, build with Vite --- kennel/app.py | 7 +------ kennel/main.py | 8 +++++--- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'kennel') diff --git a/kennel/app.py b/kennel/app.py index 98a0448..429aa1a 100644 --- a/kennel/app.py +++ b/kennel/app.py @@ -1,13 +1,8 @@ import structlog from fastapi import FastAPI -from fastapi.templating import Jinja2Templates app = FastAPI( - servers = [ - {"url": "https://kennel.hatecomputers.club", "description": "prod"} - ] + servers=[{"url": "https://kennel.hatecomputers.club", "description": "prod"}] ) logger = structlog.get_logger() - -templates = Jinja2Templates(directory="templates") diff --git a/kennel/main.py b/kennel/main.py index 17a143b..6f661cb 100644 --- a/kennel/main.py +++ b/kennel/main.py @@ -8,6 +8,7 @@ from fastapi import ( Cookie, Depends, ) +from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles from kennel.engine.systems.system import SystemType from kennel.engine.systems.network import Event, Publishable, EventType @@ -18,14 +19,15 @@ from kennel.kennel import ( entity_manager, create_session_controllable_entities, ) -from kennel.app import app, templates, logger +from kennel.app import app, logger from kennel.kennelcats import KennelCatService from kennel.middleware import logger_middleware from kennel.config import config import asyncio import uuid -app.mount("/static", StaticFiles(directory="static"), name="static") +app.mount("/static", StaticFiles(directory="static/dist"), name="static") + loop = asyncio.get_event_loop() @@ -46,7 +48,7 @@ async def shutdown_event(): @app.get("/") async def index(request: Request): - return templates.TemplateResponse(request=request, name="index.html") + return FileResponse("static/dist/index.html", media_type="text/html") @app.get("/assign") -- cgit v1.3