fix commits
commit
9b8c3aa05a
|
@ -1,11 +1,9 @@
|
|||
from fastapi import APIRouter
|
||||
|
||||
|
||||
api_router = APIRouter()
|
||||
|
||||
|
||||
@api_router.get("/ping")
|
||||
async def pong():
|
||||
"""Тестовый роут"""
|
||||
return {"ping": "pong!"}
|
||||
|
||||
|
||||
|
|
|
@ -17,4 +17,5 @@ class Settings(BaseSettings):
|
|||
|
||||
model_config = SettingsConfigDict(env_file=".env")
|
||||
|
||||
|
||||
settings = Settings()
|
||||
|
|
|
@ -5,10 +5,13 @@ from fastapi.responses import HTMLResponse
|
|||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.templating import Jinja2Templates
|
||||
|
||||
|
||||
site_router = APIRouter()
|
||||
print(os.path.abspath(os.curdir))
|
||||
site_router.mount("/static", StaticFiles(directory="servicemanager/frontend/static"), name="static")
|
||||
|
||||
site_router.mount(
|
||||
"/static",
|
||||
StaticFiles(directory="servicemanager/frontend/static"),
|
||||
name="static",
|
||||
)
|
||||
|
||||
|
||||
templates = Jinja2Templates(directory="servicemanager/frontend/templates")
|
||||
|
@ -16,6 +19,4 @@ templates = Jinja2Templates(directory="servicemanager/frontend/templates")
|
|||
|
||||
@site_router.get("/testpage", response_class=HTMLResponse)
|
||||
async def read_item(request: Request):
|
||||
return templates.TemplateResponse(
|
||||
request=request, name="test.html"
|
||||
)
|
||||
return templates.TemplateResponse(request=request, name="test.html")
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
<html>
|
||||
|
||||
<head>
|
||||
<title>test page</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>test_data</h1>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
import asyncio
|
||||
import sys
|
||||
|
||||
from fastapi import FastAPI
|
||||
import uvicorn
|
||||
|
||||
from api.routes import api_router
|
||||
from fastapi import FastAPI
|
||||
from frontend.routes import site_router
|
||||
|
||||
|
||||
|
@ -12,12 +11,7 @@ async def generate_test_data():
|
|||
"""
|
||||
Создание БД и наполнение ее данными
|
||||
"""
|
||||
print('generating data')
|
||||
from backend.queries.user import UserORM
|
||||
await UserORM.create_tables()
|
||||
await UserORM.insert_admin()
|
||||
|
||||
|
||||
print("generating data")
|
||||
|
||||
|
||||
def create_app():
|
||||
|
@ -49,4 +43,3 @@ if __name__ == "__main__":
|
|||
|
||||
if "--webserver" in sys.argv:
|
||||
run_app()
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ from starlette.testclient import TestClient
|
|||
|
||||
from servicemanager.main import create_app
|
||||
|
||||
|
||||
client = TestClient(create_app())
|
||||
|
||||
|
||||
def test_testpage():
|
||||
response = client.get("/testpage")
|
||||
assert response.status_code == 200
|
||||
|
|
|
@ -2,9 +2,9 @@ from starlette.testclient import TestClient
|
|||
|
||||
from servicemanager.main import create_app
|
||||
|
||||
|
||||
client = TestClient(create_app())
|
||||
|
||||
|
||||
def test_ping():
|
||||
response = client.get("/ping")
|
||||
assert response.status_code == 200
|
||||
|
|
Loading…
Reference in New Issue