web sttarting
This commit is contained in:
12
web/views/content_users/main_page.py
Normal file
12
web/views/content_users/main_page.py
Normal 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),
|
||||
|
||||
],
|
||||
)
|
||||
@@ -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
167
web/views/reg_view.py
Normal 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
81
web/views/user_view.py
Normal 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
|
||||
]
|
||||
)
|
||||
|
||||
]
|
||||
Reference in New Issue
Block a user