From 5a4458661c16405d8fede2cd7b8a3ee9c712560a Mon Sep 17 00:00:00 2001 From: Iam54r1n4 Date: Fri, 7 Feb 2025 18:25:51 +0000 Subject: [PATCH] Better endpoints --- core/scripts/webpanel/app.py | 3 +-- core/scripts/webpanel/routers/__init__.py | 3 +-- core/scripts/webpanel/routers/config/__init__.py | 1 - core/scripts/webpanel/routers/config/config.py | 10 ---------- core/scripts/webpanel/routers/settings/settings.py | 8 ++++++-- 5 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 core/scripts/webpanel/routers/config/__init__.py delete mode 100644 core/scripts/webpanel/routers/config/config.py diff --git a/core/scripts/webpanel/app.py b/core/scripts/webpanel/app.py index 1820702..9d04819 100644 --- a/core/scripts/webpanel/app.py +++ b/core/scripts/webpanel/app.py @@ -51,10 +51,9 @@ def create_app() -> FastAPI: # Set up Routers app.include_router(routers.basic.router, prefix='', tags=['Basic Routes[Web]']) # Add basic router app.include_router(routers.login.router, prefix='', tags=['Authentication[Web]']) # Add authentication router - app.include_router(routers.config.router, prefix='/config', tags=['Config Management[Web]']) # Add config router + app.include_router(routers.settings.router, prefix='/settings', tags=['Settings[Web]']) # Add settings router app.include_router(routers.user.router, prefix='/users', tags=['User Management[Web]']) # Add user router app.include_router(routers.api.v1.api_v1_router, prefix='/api/v1', tags=['API Version 1']) # Add API version 1 router # type: ignore - app.include_router(routers.settings.router, prefix='/settings', tags=['Settings[Web]']) # Add settings router # Document that the API requires an API key setup_openapi_schema(app) diff --git a/core/scripts/webpanel/routers/__init__.py b/core/scripts/webpanel/routers/__init__.py index dec3821..9db98b2 100644 --- a/core/scripts/webpanel/routers/__init__.py +++ b/core/scripts/webpanel/routers/__init__.py @@ -2,5 +2,4 @@ from . import basic from . import api from . import user from . import login -from . import config -from . import settings \ No newline at end of file +from . import settings diff --git a/core/scripts/webpanel/routers/config/__init__.py b/core/scripts/webpanel/routers/config/__init__.py deleted file mode 100644 index 69fedd5..0000000 --- a/core/scripts/webpanel/routers/config/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .config import router diff --git a/core/scripts/webpanel/routers/config/config.py b/core/scripts/webpanel/routers/config/config.py deleted file mode 100644 index b919654..0000000 --- a/core/scripts/webpanel/routers/config/config.py +++ /dev/null @@ -1,10 +0,0 @@ -from fastapi import APIRouter, Depends, Request -from fastapi.templating import Jinja2Templates -from dependency import get_templates - -router = APIRouter() - - -@router.get('/') -async def config(request: Request, templates: Jinja2Templates = Depends(get_templates)): - return templates.TemplateResponse('config.html', {'request': request}) diff --git a/core/scripts/webpanel/routers/settings/settings.py b/core/scripts/webpanel/routers/settings/settings.py index d548eb7..c70fabe 100644 --- a/core/scripts/webpanel/routers/settings/settings.py +++ b/core/scripts/webpanel/routers/settings/settings.py @@ -5,7 +5,11 @@ from dependency import get_templates router = APIRouter() -@router.get('/') +@router.get('/config') +async def config(request: Request, templates: Jinja2Templates = Depends(get_templates)): + return templates.TemplateResponse('config.html', {'request': request}) + + +@router.get('/settings') async def settings(request: Request, templates: Jinja2Templates = Depends(get_templates)): return templates.TemplateResponse('settings.html', {'request': request}) -