From 6aa9211ab7c8a7c6e534a86c10cd1b9c4d1edd64 Mon Sep 17 00:00:00 2001 From: dmitrium12 Date: Sat, 29 Apr 2023 08:58:09 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=20=D0=B8=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D0=BE=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 6 +++++- Bot.py => modules/Bot.py | 4 ++-- modules/Site.py | 33 +++++++++++++++++++++++++++++++++ test.py | 37 ------------------------------------- 4 files changed, 40 insertions(+), 40 deletions(-) rename Bot.py => modules/Bot.py (96%) create mode 100644 modules/Site.py diff --git a/main.py b/main.py index b69eb9b..bdb687b 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,11 @@ -from Bot import start_work_bot +import multiprocessing +from modules.Bot import start_work_bot +from modules.Site import Site def main(): + process1 = multiprocessing.Process(target=Site) + process1.start() start_work_bot() diff --git a/Bot.py b/modules/Bot.py similarity index 96% rename from Bot.py rename to modules/Bot.py index 7c9d0f7..3746355 100755 --- a/Bot.py +++ b/modules/Bot.py @@ -44,10 +44,10 @@ async def r_clear(message: types.Message): @dp.message_handler(content_types=['text']) async def not_work_user(message: types.Message): if str(message.from_user.id) == "620318992" and message.text == "Гена, бань его нахуй" and message.reply_to_message: - with open('not_work_user.json', 'r') as f: + with open('../not_work_user.json', 'r') as f: data = json.load(f) data['chat_gpt'].append(message.reply_to_message.from_user.id) - with open('not_work_user.json', 'w') as f: + with open('../not_work_user.json', 'w') as f: json.dump(data, f, indent=4) await message.reply(f"@{message.reply_to_message.from_user.username} " f"вы больше не можете со мной разговаривать") diff --git a/modules/Site.py b/modules/Site.py new file mode 100644 index 0000000..aeee6a5 --- /dev/null +++ b/modules/Site.py @@ -0,0 +1,33 @@ +from fastapi import FastAPI, Request, Form, Depends, Cookie, responses, templating, staticfiles +from functions.admin import is_logged_in +from functions.admin.models import database +from functions.admin.templates import logins, refresh, logs, log + +def Site(): + app = FastAPI() + templates = templating.Jinja2Templates(directory="static/templates") + app.mount("/static", staticfiles.StaticFiles(directory="static"), name="static") + + @app.get("/", response_class=responses.HTMLResponse) + def login(request: Request): + return templates.TemplateResponse("index.html", {"request": request}) + + @app.get("/login", response_class=responses.HTMLResponse) + def login(request: Request): + return templates.TemplateResponse("login.html", {"request": request}) + + @app.post("/logins") + async def logins_response(username: str = Form(...), password: str = Form(...), db=Depends(database.get_db)): + return await logins.logins(username, password, db) + + @app.get("/refresh") + async def refresh_access_token(req: Request, refresh_token: str = Cookie(None), db=Depends(database.get_db)): + return await refresh.refresh_access_token(req, refresh_token, db) + + @app.get("/logs", response_class=responses.HTMLResponse) + async def logs_response(request: Request, logged_in: bool = Depends(is_logged_in.is_logged_in)): + return await logs.logs(templates, request, logged_in) + + @app.get("/logs/{log_id}", response_class=responses.HTMLResponse) + async def log_response(request: Request, log_id: int, logged_in: bool = Depends(is_logged_in.is_logged_in)): + return await log.log(templates, request, log_id, logged_in) diff --git a/test.py b/test.py index d96d5c0..e69de29 100644 --- a/test.py +++ b/test.py @@ -1,37 +0,0 @@ -from fastapi import FastAPI, Request, Form, Depends, Cookie, responses, templating, staticfiles -from functions.admin import is_logged_in -from functions.admin.models import database -from functions.admin.templates import logins, refresh, logs, log - -app = FastAPI() -templates = templating.Jinja2Templates(directory="static/templates") -app.mount("/static", staticfiles.StaticFiles(directory="static"), name="static") - -@app.get("/", response_class=responses.HTMLResponse) -def login(request: Request): - return templates.TemplateResponse("index.html", {"request": request}) - - -@app.get("/login", response_class=responses.HTMLResponse) -def login(request: Request): - return templates.TemplateResponse("login.html", {"request": request}) - - -@app.post("/logins") -async def logins_response(username: str = Form(...), password: str = Form(...), db=Depends(database.get_db)): - return await logins.logins(username, password, db) - - -@app.get("/refresh") -async def refresh_access_token(req: Request, refresh_token: str = Cookie(None), db=Depends(database.get_db)): - return await refresh.refresh_access_token(req, refresh_token, db) - - -@app.get("/logs", response_class=responses.HTMLResponse) -async def logs_response(request: Request, logged_in: bool = Depends(is_logged_in.is_logged_in)): - return await logs.logs(templates, request, logged_in) - - -@app.get("/logs/{log_id}", response_class=responses.HTMLResponse) -async def log_response(request: Request, log_id: int, logged_in: bool = Depends(is_logged_in.is_logged_in)): - return await log.log(templates, request, log_id, logged_in)