Delete unwaanted things & modify app.py

core/scripts/webpanel/app.py

@@ -9,35 +9,36 @@ from starlette.staticfiles import StaticFiles
 
 import routers
 
-# Append directory of cli.py to be able to import it
+# Append directory of cli_api.py to be able to import it
 HYSTERIA_CORE_DIR = '/etc/hysteria/core/'
 sys.path.append(HYSTERIA_CORE_DIR)
+# Now we can do `import cli_api`
 
-
+# region Setup App
-
+app = FastAPI(debug=True)
-app = FastAPI()
+app.mount('/assets', StaticFiles(directory='assets'), name='assets')
-
-app.mount('/assets', StaticFiles(directory='asset'), name='assets')
-app.add_middleware(SessionMiddleware, secret_key='your-secret-key')
-
-
 templates = Jinja2Templates(directory='templates')
+# TODO: fix this
+# app.add_middleware(SessionMiddleware, secret_key='your-secret-key')
 
-app.include_router(router=routers.user.router,prefix='/user')
+# endregion
-app.include_router(router=routers.hysteria.router,prefix='/settings/hysteria')
-app.include_router(router=routers.warp.router,prefix='/settings/warp')
 
 
+# region Routers
+# Add API version 1 router
+app.include_router(routers.api.v1.router, prefix='/api/v1', tags=['v1'])
 
 
+# Add basic routes
 @app.get('/')
 async def index(request: Request):
     return templates.TemplateResponse('index.html', {'request': request})
-    return templates.TemplateResponse('index.html', {'request': request})
+
 
 @app.get('/home')
 async def home(request: Request):
     return await index(request)
+# endregion
 
 
 if __name__ == '__main__':

core/scripts/webpanel/routers/hysteria.py

@@ -1,27 +0,0 @@
-from fastapi import APIRouter
-from fastapi import Request
-
-router = APIRouter()
-
-
-@router.get('uninstall')
-async def uninstall(request: Request):
-    pass
-
-
-@router.get('restart')
-async def restart(request: Request):
-    pass
-
-
-@router.get('update')
-async def update(request: Request):
-    pass
-
-@router.get('change-port')
-async def change_port(request: Request):
-    pass
-
-@router.get('change-sni')
-async def change_sni(request: Request):
-    pass

core/scripts/webpanel/routers/user.py

@@ -1,35 +0,0 @@
-from fastapi import APIRouter, Request
-
-router = APIRouter()
-
-
-@router.get('users')
-async def users(request: Request):
-    #return templates.TemplateResponse('peers.html', {'request': request})
-    pass
-
-
-@router.get('add')
-async def add(request: Request):
-    pass
-
-@router.get('edit')
-async def edit(request: Request): # TODO: get id
-    pass
-
-@router.get('remove')
-async def remove(request: Request): # TODO: get id
-    pass
-
-@router.get('get')
-async def get(request: Request): # TODO: get id
-    pass
-
-@router.get('get-uri')
-async def get_uri(request: Request): # TODO: get id
-    pass
-
-
-@router.get('reset')
-async def reset(request: Request): # TODO: get id
-    pass