jze9/api-copp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web sttarting

Browse Source
This commit is contained in:
jze9
2026-03-31 13:25:14 +05:00
parent 9cd6d83428
commit 59b3bcd0f4
30 changed files with 720 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
web/designer.py
View File

@@ -10,7 +10,7 @@ class clolors:
class CastomTextField_input(ft.TextField):
def __init__(self, on_change, on_submit, label="Ваше имя", hint_text="Введите текст...", prefix_icon=None, suffix_icon=None):
def __init__(self, on_change=None, on_submit=None, label="Ваше имя", hint_text="Введите текст...", prefix_icon=None, suffix_icon=None, **kwargs):
super().__init__(
label=label,
hint_text=hint_text,
@@ -34,6 +34,7 @@ class CastomTextField_input(ft.TextField):
suffix_icon=suffix_icon,
on_change=on_change,
on_submit=on_submit,
**kwargs,
)
class CastomButton(ft.Button):
@@ -50,6 +51,38 @@ class CastomButton(ft.Button):
on_click=on_click
)
class CastomDropdown(ft.Dropdown):
def __init__(self, label="", hint_text="", options=None, on_change=None):
super().__init__(
label=label,
hint_text=hint_text,
options=options or [],
filled=True,
fill_color=clolors.laer3,
color=clolors.ferst,
border_color=clolors.laer2,
border_radius=12,
focused_border_color=clolors.laer1,
label_style=ft.TextStyle(
color=clolors.ferst,
weight=ft.FontWeight.BOLD,
),
hint_style=ft.TextStyle(
color=clolors.laer1,
italic=True,
),
text_style=ft.TextStyle(
color=clolors.ferst,
size=16,
),
menu_style=ft.MenuStyle(
bgcolor=clolors.laer3,
),
)
if on_change is not None:
self.on_select = on_change
class CastomSwitch(ft.Switch):
def __init__(self, label, on_change):
super().__init__(
@@ -239,4 +272,5 @@ class AlterDiaalogApproval(ft.AlertDialog):
def accept(self, e):
self.dialog_result = True
self.open = False
self.page.update()
self.page.update()
self.page.run_task(self.page.push_route, "/login")

93
web/info.py
View File

@@ -1,4 +1,5 @@
import os
import secrets
import httpx
import flet as ft
@@ -25,7 +26,13 @@ class AuthService:
)
if resp.status_code == 200:
token = resp.json()["access_token"]
self._page.session.set(_TOKEN_KEY, token)
self._page.session.store.set(_TOKEN_KEY, token)
# Случайный ключ для URL профиля — хранится только в памяти сессии
self._page.session.store.set("session_key", secrets.token_hex(16))
# user_id Для фетчинга данных
me = await self._get_me(token)
if me:
self._page.session.store.set("user_id", me["id"])
return None
elif resp.status_code == 401:
return "Неверный логин или пароль"
@@ -36,14 +43,94 @@ class AuthService:
except Exception as e:
return f"Ошибка: {e}"
async def _get_me(self, token: str) -> dict | None:
"""Внутренний метод: получает данные текущего пользователя по токену."""
try:
async with httpx.AsyncClient(base_url=API_URL, timeout=10) as client:
resp = await client.get(
"/users/me",
headers={"Authorization": f"Bearer {token}"},
)
if resp.status_code == 200:
return resp.json()
except Exception:
pass
return None
async def get_me(self) -> dict | None:
"""Возвращает данные текущего пользователя или None."""
token = self._page.session.store.get(_TOKEN_KEY)
if not token:
return None
return await self._get_me(token)
async def logout(self):
"""Удаляет токен — пользователь разлогинен."""
self._page.session.remove(_TOKEN_KEY)
self._page.session.store.remove(_TOKEN_KEY)
self._page.session.store.remove("user_id")
self._page.session.store.remove("session_key")
async def get_token(self) -> str | None:
"""Возвращает сохранённый токен или None если не авторизован."""
return self._page.session.get(_TOKEN_KEY)
return self._page.session.store.get(_TOKEN_KEY)
async def is_authenticated(self) -> bool:
token = await self.get_token()
return token is not None and token != ""
async def register(
self,
username: str,
password: str,
first_name: str,
last_name: str,
group_id: str | None = None,
organization_id: str | None = None,
) -> str | None:
"""
Отправляет запрос на POST /auth/register.
Возвращает None при успехе, строку с ошибкой при неудаче.
"""
payload = {
"username": username,
"password": password,
"first_name": first_name,
"last_name": last_name,
}
if group_id:
payload["group_id"] = group_id
if organization_id:
payload["organization_id"] = organization_id
try:
async with httpx.AsyncClient(base_url=API_URL, timeout=10) as client:
resp = await client.post("/auth/register", json=payload)
if resp.status_code == 201:
return None
elif resp.status_code == 400:
return resp.json().get("detail", "Ошибка регистрации")
else:
return f"Ошибка сервера: {resp.status_code}"
except httpx.ConnectError:
return "Не удалось подключиться к серверу"
except Exception as e:
return f"Ошибка: {e}"
async def get_organizations(self) -> list:
try:
async with httpx.AsyncClient(base_url=API_URL, timeout=10) as client:
resp = await client.get("/organizations/")
if resp.status_code == 200:
return resp.json()
except Exception:
pass
return []
async def get_groups(self) -> list:
try:
async with httpx.AsyncClient(base_url=API_URL, timeout=10) as client:
resp = await client.get("/groups/")
if resp.status_code == 200:
return resp.json()
except Exception:
pass
return []

34
web/main.py
View File

@@ -1,36 +1,14 @@
import flet as ft
from view import ViewsHendler
import designer as ds
from info import AuthService
from router import setup_router
async def main(page: ft.Page):
page.title = "COPP"
page.bgcolor = ds.clolors.background
auth = AuthService(page)
_PUBLIC_ROUTES = {"/login"}
def route_change(e: ft.RouteChangeEvent):
page.run_task(_guarded_route_change, page.route)
async def _guarded_route_change(route: str):
if route not in _PUBLIC_ROUTES and not await auth.is_authenticated():
await page.push_route("/login")
return
page.views.clear()
view = ViewsHendler(page).get(route)
if view:
page.views.append(view)
else:
await page.push_route("/main")
page.update()
page.on_route_change = route_change
setup_router(page)
initial = page.route if page.route and page.route not in ("/", "") else "/login"
await page.push_route(initial)
await page.push_route("/main")
# export_asgi_app=True — Flet отдаёт ASGI-объект вместо запуска встроенного сервера.
# Uvicorn из CMD в Dockerfile подхватывает этот объект через «main:app».
app = ft.run(main, export_asgi_app=True, assets_dir="assets")
app = ft.run(main, export_asgi_app=True, assets_dir="assets")

40
web/router.py Normal file
View File

@@ -0,0 +1,40 @@
import flet as ft
from view import resolve_view, PUBLIC_ROUTES
async def _handle_route_change(page: ft.Page, e: ft.RouteChangeEvent):
route = page.route
token = page.session.store.get("auth_token")
# Публичные маршруты — без проверки токена
if route in PUBLIC_ROUTES:
views = resolve_view(page, route)
page.views.clear()
page.views.extend(views)
page.update()
return
# Защищённый маршрут без токена → логин
if not token:
await page.push_route("/login")
return
views = resolve_view(page, route)
# Неизвестный маршрут → на страницу пользователя
if views is None:
session_key = page.session.store.get("session_key") or ""
await page.push_route(f"/user/{session_key}")
return
page.views.clear()
page.views.extend(views)
page.update()
def setup_router(page: ft.Page):
"""Привязывает router к странице. Вызывается один раз в main()."""
async def _on_route_change(e: ft.RouteChangeEvent):
await _handle_route_change(page, e)
page.on_route_change = _on_route_change

26
web/view.py
View File

@@ -1,10 +1,20 @@
import flet as ft
from views import main_view, login_view
from views import main_view, login_view, reg_view, user_view
def ViewsHendler(page: ft.Page):
return {
"/main": main_view.MainView(),
"/login": login_view.LoginView(page),
"/about": ft.View(route="/about", controls=[ft.Text("О нас",color="#008000", size=20)]),
"/contact": ft.View(route="/contact", controls=[ft.Text("Контакты",color="#FF0000", size=20)])
}
PUBLIC_ROUTES = {"/login", "/reg"}
def resolve_view(page: ft.Page, route: str) -> list[ft.View] | None:
"""
Возвращает список вью для заданного маршрута или None если маршрут неизвестен.
Flet использует page.views как стек: последний элемент — активный экран.
"""
if route == "/login":
return [login_view.LoginView(page)]
elif route == "/reg":
return [reg_view.RegView(page)]
elif route == "/main":
return [main_view.MainView()]
elif route.startswith("/user/"):
return [user_view.UserView(page)]
return None

12
web/views/content_users/main_page.py Normal file
View File

@@ -0,0 +1,12 @@
import flet as ft
import designer as ds
class MainPageUser(ft.Column):
def __init__(self):
super().__init__(
spacing=16,
controls=[
ft.Text("Добро пожаловать в COPP!", color=ds.clolors.ferst, size=24, weight=ft.FontWeight.BOLD),
],
)

29
web/views/login_view.py
View File

@@ -7,31 +7,18 @@ class LoginView(ft.View):
def __init__(self, page: ft.Page):
self._auth = AuthService(page)
self._username = ft.TextField(
self._username = ds.CastomTextField_input(
label="Логин",
hint_text="Введите логин...",
filled=True,
bgcolor=ds.clolors.ferst,
border_color=ds.clolors.laer2,
border_radius=12,
prefix_icon=ft.Icons.PERSON,
label_style=ft.TextStyle(color=ds.clolors.laer3, weight=ft.FontWeight.BOLD),
text_style=ft.TextStyle(color=ds.clolors.laer3, size=16),
)
self._password = ft.TextField(
self._password = ds.CastomTextField_input(
label="Пароль",
hint_text="Введите пароль...",
filled=True,
bgcolor=ds.clolors.ferst,
border_color=ds.clolors.laer2,
border_radius=12,
prefix_icon=ft.Icons.LOCK,
password=True,
can_reveal_password=True,
label_style=ft.TextStyle(color=ds.clolors.laer3, weight=ft.FontWeight.BOLD),
text_style=ft.TextStyle(color=ds.clolors.laer3, size=16),
on_submit=lambda e: page.run_task(self._do_login),
)
self._error = ft.Text("", color=ft.Colors.RED_400, size=14, visible=False)
@@ -41,6 +28,12 @@ class LoginView(ft.View):
on_click=lambda e: page.run_task(self._do_login),
)
self._reg_link = ft.TextButton(
content="Нет аккаунта? Зарегистрироваться",
style=ft.ButtonStyle(color=ds.clolors.ferst),
on_click=lambda e: page.run_task(page.push_route, "/reg"),
)
super().__init__(
route="/login",
bgcolor=ds.clolors.background,
@@ -64,6 +57,7 @@ class LoginView(ft.View):
self._password,
self._error,
self._btn,
self._reg_link,
],
),
),
@@ -87,8 +81,9 @@ class LoginView(ft.View):
self._btn.disabled = False
self._show_error(error)
else:
# Успешный вход — переходим на главную
await self.page.push_route("/main")
# Успешный вход — переходим на страницу пользователя
session_key = self.page.session.store.get("session_key")
await self.page.push_route(f"/user/{session_key}")
def _show_error(self, message: str):
self._error.value = message

167
web/views/reg_view.py Normal file
View File

@@ -0,0 +1,167 @@
import asyncio
import flet as ft
import designer as ds
from info import AuthService
class RegView(ft.View):
def __init__(self, page: ft.Page):
self._auth = AuthService(page)
self._orgs: list = []
self._first_name = ds.CastomTextField_input(
label="Имя",
hint_text="Введите имя...",
prefix_icon=ft.Icons.PERSON,
)
self._last_name = ds.CastomTextField_input(
label="Фамилия",
hint_text="Введите фамилию...",
prefix_icon=ft.Icons.PERSON_OUTLINE,
)
self._username = ds.CastomTextField_input(
label="Логин",
hint_text="Введите логин...",
prefix_icon=ft.Icons.ALTERNATE_EMAIL,
)
self._password = ds.CastomTextField_input(
label="Пароль",
hint_text="Введите пароль...",
prefix_icon=ft.Icons.LOCK,
password=True,
can_reveal_password=True,
)
self._org_dropdown = ds.CastomDropdown(
label="Организация",
hint_text="Загрузка...",
)
self._org_dropdown.on_select = self._on_org_change
self._group_dropdown = ds.CastomDropdown(
label="Группа",
hint_text="Загрузка...",
)
self._error = ft.Text("", color=ft.Colors.RED_400, size=14, visible=False)
self._btn = ds.CastomButton(
text="Зарегистрироваться",
on_click=lambda e: page.run_task(self._do_register),
)
self._btn_cansel = ds.CastomButton(
text="Назад",
on_click=lambda e: page.run_task(self._do_cancel),
)
super().__init__(
route="/reg",
bgcolor=ds.clolors.background,
horizontal_alignment=ft.CrossAxisAlignment.CENTER,
vertical_alignment=ft.MainAxisAlignment.CENTER,
)
self.controls = [
ft.Text("COPP", color=ds.clolors.ferst, size=30, weight=ft.FontWeight.BOLD),
ft.Container(height=8),
ft.Text("Регистрация в системе", color=ds.clolors.ferst, size=16),
ft.Container(height=24),
ft.Container(
width=360,
padding=ft.padding.all(24),
bgcolor=ds.clolors.laer3,
border_radius=16,
content=ft.Column(
spacing=16,
scroll="auto",
controls=[
self._first_name,
self._last_name,
self._username,
self._password,
self._org_dropdown,
self._group_dropdown,
self._error,
ft.Row(
controls=[
self._btn_cansel,
self._btn,
],
)
],
),
),
]
def did_mount(self):
self.page.run_task(self._load_data)
async def _load_data(self):
orgs, groups = await asyncio.gather(
self._auth.get_organizations(),
self._auth.get_groups(),
)
self._orgs = orgs or []
_opt_style = ft.ButtonStyle(color=ds.clolors.ferst)
self._org_dropdown.options = [
ft.DropdownOption(key=o["id"], text=o["name_organization"], style=_opt_style) for o in self._orgs
]
self._org_dropdown.hint_text = "Выберите организацию..."
self._group_dropdown.options = [
ft.DropdownOption(key=g["id"], text=g["name_group"], style=_opt_style) for g in (groups or [])
]
self._group_dropdown.hint_text = "Выберите группу..."
self.update()
def _on_org_change(self, e):
# Автоматически выбираем группу, к которой привязана организация
selected_id = e.control.value
for o in self._orgs:
if o["id"] == selected_id:
self._group_dropdown.value = o.get("group_id")
break
self.update()
async def _do_cancel(self):
await self.page.push_route("/login")
async def _do_register(self):
first_name = self._first_name.value.strip() if self._first_name.value else ""
last_name = self._last_name.value.strip() if self._last_name.value else ""
username = self._username.value.strip() if self._username.value else ""
password = self._password.value or ""
if not all([first_name, last_name, username, password]):
self._show_error("Заполните все обязательные поля")
return
self._btn.disabled = True
self._error.visible = False
self.update()
error = await self._auth.register(
username=username,
password=password,
first_name=first_name,
last_name=last_name,
group_id=self._group_dropdown.value,
organization_id=self._org_dropdown.value,
)
if error:
self._btn.disabled = False
self._show_error(error)
else:
await self.page.push_route("/login")
def _show_error(self, message: str):
self._error.value = message
self._error.visible = True
self.update()

81
web/views/user_view.py Normal file
View File

@@ -0,0 +1,81 @@
import flet as ft
import designer as ds
from info import AuthService
class UserView(ft.View):
def __init__(self, page: ft.Page):
self._auth = AuthService(page)
session_key = page.session.store.get("session_key") or ""
self.spacing_groop = 6
self.border_radius = 15
self.content = ft.Container(
expand=True,
content=ft.Column(
alignment=ft.MainAxisAlignment.CENTER,
spacing=self.spacing_groop,
controls=[
ft.Row(
alignment=ft.MainAxisAlignment.CENTER,
spacing=self.spacing_groop,
controls=[
ft.Container(
border_radius=self.border_radius,
height=200,
width=200,
bgcolor=ds.clolors.laer2
),
ft.Container(
border_radius=self.border_radius,
height=200,
width=200,
bgcolor=ds.clolors.laer2
)
]
),
ft.Row(
alignment=ft.MainAxisAlignment.CENTER,
spacing=self.spacing_groop,
controls=[
ft.Container(
border_radius=self.border_radius,
height=200,
width=200,
bgcolor=ds.clolors.laer2
),
ft.Container(
border_radius=self.border_radius,
height=200,
width=200,
bgcolor=ds.clolors.laer2
)
]
),
],
)
)
super().__init__(
route=f"/user/{session_key}",
bgcolor=ds.clolors.background,
horizontal_alignment=ft.CrossAxisAlignment.START,
vertical_alignment=ft.MainAxisAlignment.START,
)
self.controls = [
ft.Column(
expand=True,
alignment=ft.MainAxisAlignment.CENTER,
controls=[
ft.Row(
controls=[
ft.Text("Добро пожаловать в COPP!", color=ds.clolors.ferst, size=24, weight=ft.FontWeight.BOLD),
]
),
self.content
]
)
]