refactor(account): remove unused print

Reviewed-on: #7
Reviewed-by: ivan.dev <ivan.dev@heado.ru>
Reviewed-by: cyrussmeat <dr.cyrill@gmail.com>

Makefile

@@ -49,3 +49,12 @@ install:
 
 %::
 	echo $(MESSAGE)
+
+format-api:
+	cd api && \
+	poetry run ruff format .
+
+
+check-api:
+	cd api && \
+	poetry run ruff format . --check

api/api/__main__.py

@@ -21,7 +21,6 @@ def bind_routes(application: FastAPI, setting: DefaultSettings) -> None:
         application.include_router(route, prefix=setting.PATH_PREFIX)
 
 
-
 def get_app() -> FastAPI:
     """Creates application and all dependable objects."""
     loguru.logger.remove()
@@ -80,7 +79,6 @@ app.add_middleware(
     allow_credentials=True,
     allow_methods=["GET", "POST", "OPTIONS", "DELETE", "PUT"],
     allow_headers=["*"],
-
 )
 
 app.add_middleware(MiddlewareAccessTokenValidadtion)

api/api/config/default.py

@@ -44,16 +44,11 @@ class DefaultSettings(BaseSettings):
     REDIS_DB: int = int(environ.get("REDIS_DB", "0"))
     REDIS_PASSWORD: str = environ.get("REDIS_PASSWORD", "hackme")
 
-
     SECRET_KEY: str = environ.get("SECRET_KEY", "secret")
     ALGORITHM: str = environ.get("ALGORITHM", "HS256")
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(
-        environ.get("ACCESS_TOKEN_EXPIRE_MINUTES", 600)
-    )
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(environ.get("ACCESS_TOKEN_EXPIRE_MINUTES", 600))
 
-    REFRESH_TOKEN_EXPIRE_DAYS: int = int(
-        environ.get("REFRESH_TOKEN_EXPIRE_DAYS_LONG", 365)
-    )
+    REFRESH_TOKEN_EXPIRE_DAYS: int = int(environ.get("REFRESH_TOKEN_EXPIRE_DAYS_LONG", 365))
 
     @cached_property
     def database_settings(self) -> dict:

api/api/db/connection/session.py

@@ -8,18 +8,16 @@ import asyncio
 import sqlalchemy
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
-from sqlalchemy import URL,create_engine, text
+from sqlalchemy import URL, create_engine, text
 
 
 from api.config import get_settings
 from api.config.default import DbCredentialsSchema
 
 
-
 class SessionManager:
     engines: Any
 
-
     def __init__(self, database_uri=get_settings().database_uri) -> None:
         self.database_uri = database_uri
         self.refresh(database_uri)
@@ -44,9 +42,11 @@ class SessionManager:
                 pool_size=get_settings().CONNECTION_POOL_SIZE,
                 max_overflow=get_settings().CONNECTION_OVERFLOW,
             )
+
     def get_engine_by_db_uri(self, database_uri) -> AsyncEngine:
         return self.engines[database_uri]
 
+
 @contextlib.asynccontextmanager
 async def get_connection(
     database_uri=None,
@@ -58,6 +58,7 @@ async def get_connection(
     async with engine.connect() as conn:
         yield conn
 
+
 async def get_connection_dep() -> AsyncConnection:
     async with get_connection() as conn:
         yield conn

api/api/db/logic/account.py

@@ -16,10 +16,7 @@ async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]:
     """
     Получает юзера по id.
     """
-    query = (
-        select(account_table)
-        .where(account_table.c.id == id)
-    )
+    query = select(account_table).where(account_table.c.id == id)
 
     user_db_cursor = await connection.execute(query)
     user_db = user_db_cursor.one_or_none()
@@ -28,8 +25,11 @@ async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]:
         return None
 
     user_data = {
-        column.name: (getattr(user_db, column.name).name if isinstance(
-            getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
+        column.name: (
+            getattr(user_db, column.name).name
+            if isinstance(getattr(user_db, column.name), Enum)
+            else getattr(user_db, column.name)
+        )
         for column in account_table.columns
     }
 
@@ -40,22 +40,24 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us
     """
     Получает юзера по login.
     """
-    query = (
-        select(account_table)
-        .where(account_table.c.login == login)
-    )
+    query = select(account_table).where(account_table.c.login == login)
 
     user_db_cursor = await connection.execute(query)
     user_db = user_db_cursor.one_or_none()
 
     if not user_db:
         return None
+    print("user_db", user_db)
 
     user_data = {
-        column.name: (getattr(user_db, column.name).name if isinstance(
-            getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
+        column.name: (
+            getattr(user_db, column.name).name
+            if isinstance(getattr(user_db, column.name), Enum)
+            else getattr(user_db, column.name)
+        )
         for column in account_table.columns
     }
+    print("user_data", user_data)
 
     return User.model_validate(user_data)
 
@@ -64,11 +66,7 @@ async def update_user_id(connection: AsyncConnection, update_values, user) -> Op
     """
     Вносит изменеия в нужное поле таблицы account_table.
     """
-    await connection.execute(
-        account_table.update()
-        .where(account_table.c.id == user.id)
-        .values(**update_values)
-    )
+    await connection.execute(account_table.update().where(account_table.c.id == user.id).values(**update_values))
 
     await connection.commit()
 
@@ -86,11 +84,9 @@ async def create_user(connection: AsyncConnection, user: User, creator_id: int)
         meta=user.meta,
         creator_id=creator_id,
         created_at=datetime.now(timezone.utc),
-        status=user.status.value
+        status=user.status.value,
     )
 
-
-
     await connection.execute(query)
 
     await connection.commit()

api/api/db/logic/auth.py

@@ -15,12 +15,10 @@ from datetime import datetime,  timezone
 
 
 async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
-
     query = (
         select(account_table, account_keyring_table)
         .join(account_keyring_table, account_table.c.id == account_keyring_table.c.owner_id)
-        .where(account_table.c.login == login,
-               account_keyring_table.c.key_type == KeyType.PASSWORD)
+        .where(account_table.c.login == login, account_keyring_table.c.key_type == KeyType.PASSWORD)
     )
 
     user_db_cursor = await connection.execute(query)
@@ -29,16 +27,21 @@ async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
     if not user_db:
         return None, None
 
-
     user_data = {
-        column.name: (getattr(user_db, column.name).name if isinstance(
-            getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
+        column.name: (
+            getattr(user_db, column.name).name
+            if isinstance(getattr(user_db, column.name), Enum)
+            else getattr(user_db, column.name)
+        )
         for column in account_table.columns
     }
 
     password_data = {
-        column.name: (getattr(user_db, column.name).name if isinstance(
-            getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
+        column.name: (
+            getattr(user_db, column.name).name
+            if isinstance(getattr(user_db, column.name), Enum)
+            else getattr(user_db, column.name)
+        )
         for column in account_keyring_table.columns
     }
 
@@ -47,8 +50,7 @@ async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
     return user, password
 
 
-async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_token) -> Optional[User]:
-
+async def upgrade_old_refresh_token(connection: AsyncConnection, user, refresh_token) -> Optional[User]:
     new_status = KeyStatus.EXPIRED
 
     update_query = (
@@ -57,7 +59,7 @@ async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_to
             account_table.c.id == user.id,
             account_keyring_table.c.status == KeyStatus.ACTIVE,
             account_keyring_table.c.key_type == KeyType.REFRESH_TOKEN,
-            account_keyring_table.c.key_value == refresh_token
+            account_keyring_table.c.key_value == refresh_token,
         )
         .values(status=new_status)
     )
@@ -67,8 +69,9 @@ async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_to
     await connection.commit()
 
 
-async def add_new_refresh_token(connection: AsyncConnection, new_refresh_token, new_refresh_token_expires_time, user) -> Optional[User]:
-
+async def add_new_refresh_token(
+    connection: AsyncConnection, new_refresh_token, new_refresh_token_expires_time, user
+) -> Optional[User]:
     new_refresh_token = account_keyring_table.insert().values(
         owner_id=user.id,
         key_type=KeyType.REFRESH_TOKEN,

api/api/db/logic/keyring.py

@@ -11,15 +11,11 @@ from api.schemas.account.account_keyring import AccountKeyring
 from api.schemas.endpoints.account_keyring import AccountKeyringUpdate, StatusKey, TypeKey
 
 
-
 async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[AccountKeyring]:
     """
     Получает key по key_id.
     """
-    query = (
-        select(account_keyring_table)
-        .where(account_keyring_table.c.key_id == key_id)
-    )
+    query = select(account_keyring_table).where(account_keyring_table.c.key_id == key_id)
 
     user_db_cursor = await connection.execute(query)
     user_db = user_db_cursor.one_or_none()
@@ -28,8 +24,11 @@ async def get_key_id(connection: AsyncConnection, key_id: str) -> Optional[Accou
         return None
 
     user_data = {
-        column.name: (getattr(user_db, column.name).name if isinstance(
-            getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
+        column.name: (
+            getattr(user_db, column.name).name
+            if isinstance(getattr(user_db, column.name), Enum)
+            else getattr(user_db, column.name)
+        )
         for column in account_keyring_table.columns
     }
 
@@ -41,30 +40,28 @@ async def update_key_id(connection: AsyncConnection, update_values, key) -> Opti
     Вносит изменеия в нужное поле таблицы account_keyring_table.
     """
     await connection.execute(
-            account_keyring_table.update()
-            .where(account_keyring_table.c.key_id == key.key_id)
-            .values(**update_values)
+        account_keyring_table.update().where(account_keyring_table.c.key_id == key.key_id).values(**update_values)
     )
 
     await connection.commit()
 
 
-async def create_key(connection: AsyncConnection, key: AccountKeyring, key_id:int) -> Optional[AccountKeyring]:
+async def create_key(connection: AsyncConnection, key: AccountKeyring, key_id: int) -> Optional[AccountKeyring]:
     """
     Создает нове поле в таблице account_keyring_table).
     """
     query = insert(account_keyring_table).values(
-            owner_id = key.owner_id,
-            key_type= key.key_type.value,
-            key_id= key_id,
-            key_value= key.key_value,
-            created_at= datetime.now(timezone.utc),
-            expiry= key.expiry,
-            status= key.status.value
+        owner_id=key.owner_id,
+        key_type=key.key_type.value,
+        key_id=key_id,
+        key_value=key.key_value,
+        created_at=datetime.now(timezone.utc),
+        expiry=key.expiry,
+        status=key.status.value,
     )
 
-    key.created_at= datetime.now(timezone.utc)
-    key.key_id= key_id
+    key.created_at = datetime.now(timezone.utc)
+    key.key_id = key_id
 
     await connection.execute(query)
 

api/api/db/tables/__init__.py

@@ -1 +1 @@
-from . import account,events,process
+from . import account, events, process

api/api/db/tables/account.py

@@ -7,13 +7,14 @@ from api.db.sql_types import UnsignedInt
 from api.db import metadata
 
 
-class AccountRole(str,Enum):
+class AccountRole(str, Enum):
     OWNER = auto()
     ADMIN = auto()
     EDITOR = auto()
     VIEWER = auto()
 
-class AccountStatus(str,Enum):
+
+class AccountStatus(str, Enum):
     ACTIVE = auto()
     DISABLED = auto()
     BLOCKED = auto()
@@ -21,39 +22,44 @@ class AccountStatus(str,Enum):
 
 
 account_table = Table(
-    'account', metadata,
-    Column('id', UnsignedInt, primary_key=True, autoincrement=True),
-    Column('name', String(100), nullable=False),
-    Column('login', String(100), nullable=False),
-    Column('email', String(100), nullable=True),
-    Column('bind_tenant_id', String(40), nullable=True),
-    Column('role', SQLAEnum(AccountRole), nullable=False),
-    Column('meta', JSON, default={}),
-    Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=True),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('status', SQLAEnum(AccountStatus), nullable=False),
-
-    Index('idx_login', 'login'),
-    Index('idx_name', 'name'),
+    "account",
+    metadata,
+    Column("id", UnsignedInt, primary_key=True, autoincrement=True),
+    Column("name", String(100), nullable=False),
+    Column("login", String(100), nullable=False),
+    Column("email", String(100), nullable=True),
+    Column("bind_tenant_id", String(40), nullable=True),
+    Column("role", SQLAEnum(AccountRole), nullable=False),
+    Column("meta", JSON, default={}),
+    Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=True),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("status", SQLAEnum(AccountStatus), nullable=False),
+    Index("idx_login", "login"),
+    Index("idx_name", "name"),
 )
 
-class KeyType(str,Enum):
+
+class KeyType(str, Enum):
     PASSWORD = auto()
     ACCESS_TOKEN = auto()
     REFRESH_TOKEN = auto()
     API_KEY = auto()
 
-class KeyStatus(str,Enum):
+
+class KeyStatus(str, Enum):
     ACTIVE = auto()
     EXPIRED = auto()
     DELETED = auto()
 
+
 account_keyring_table = Table(
-    'account_keyring', metadata,
-    Column('owner_id', UnsignedInt, ForeignKey('account.id'), primary_key=True, nullable=False),
-    Column('key_type', SQLAEnum(KeyType), primary_key=True, nullable=False),
-    Column('key_id', String(40),primary_key=True, default=None),
-    Column('key_value', String(255), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('expiry', DateTime(timezone=True), nullable=True),
-    Column('status', SQLAEnum(KeyStatus), nullable=False), )
+    "account_keyring",
+    metadata,
+    Column("owner_id", UnsignedInt, ForeignKey("account.id"), primary_key=True, nullable=False),
+    Column("key_type", SQLAEnum(KeyType), primary_key=True, nullable=False),
+    Column("key_id", String(40), primary_key=True, default=None),
+    Column("key_value", String(255), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("expiry", DateTime(timezone=True), nullable=True),
+    Column("status", SQLAEnum(KeyStatus), nullable=False),
+)

api/api/db/tables/events.py

@@ -6,10 +6,12 @@ from api.db.sql_types import UnsignedInt
 
 from api.db import metadata
 
+
 class EventState(str, Enum):
     AUTO = auto()
     DESCRIPTED = auto()
 
+
 class EventStatus(str, Enum):
     ACTIVE = auto()
     DISABLED = auto()
@@ -17,13 +19,14 @@ class EventStatus(str, Enum):
 
 
 list_events_table = Table(
-    'list_events', metadata,
-    Column('id', UnsignedInt, primary_key=True, autoincrement=True),
-    Column('name', String(40, collation='latin1_bin'), nullable=False,unique=True),
-    Column('title', String(64), nullable=False),
-    Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('schema', JSON, default={}),
-    Column('state', SQLAEnum(EventState), nullable=False),
-    Column('status', SQLAEnum(EventStatus), nullable=False),
+    "list_events",
+    metadata,
+    Column("id", UnsignedInt, primary_key=True, autoincrement=True),
+    Column("name", String(40, collation="latin1_bin"), nullable=False, unique=True),
+    Column("title", String(64), nullable=False),
+    Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("schema", JSON, default={}),
+    Column("state", SQLAEnum(EventState), nullable=False),
+    Column("status", SQLAEnum(EventStatus), nullable=False),
 )

api/api/db/tables/process.py

@@ -1,4 +1,16 @@
-from sqlalchemy import Table, Column, Integer, String, Text, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index, PrimaryKeyConstraint
+from sqlalchemy import (
+    Table,
+    Column,
+    Integer,
+    String,
+    Text,
+    Enum as SQLAEnum,
+    JSON,
+    ForeignKey,
+    DateTime,
+    Index,
+    PrimaryKeyConstraint,
+)
 from sqlalchemy.sql import func
 from enum import Enum, auto
 
@@ -7,7 +19,6 @@ from api.db.sql_types import UnsignedInt
 from api.db import metadata
 
 
-
 class ProcessStatus(str, Enum):
     ACTIVE = auto()
     STOPPING = auto()
@@ -16,69 +27,80 @@ class ProcessStatus(str, Enum):
 
 
 process_schema_table = Table(
-    'process_schema', metadata,
-    Column('id', UnsignedInt, primary_key=True, autoincrement=True),
-    Column('title', String(100), nullable=False),
-    Column('description', Text, nullable=False),
-    Column('owner_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('settings', JSON, default={}),
-    Column('status', SQLAEnum(ProcessStatus), nullable=False),
-
-    Index('idx_owner_id', 'owner_id',)
+    "process_schema",
+    metadata,
+    Column("id", UnsignedInt, primary_key=True, autoincrement=True),
+    Column("title", String(100), nullable=False),
+    Column("description", Text, nullable=False),
+    Column("owner_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("settings", JSON, default={}),
+    Column("status", SQLAEnum(ProcessStatus), nullable=False),
+    Index(
+        "idx_owner_id",
+        "owner_id",
+    ),
 )
 
 process_version_archive_table = Table(
-    'process_version_archive', metadata,
-    Column('id', UnsignedInt, autoincrement=True, nullable=False),
-    Column('ps_id', UnsignedInt, ForeignKey('process_schema.id'), nullable=False),
-    Column('version', UnsignedInt, default=1, nullable=False),
-    Column('snapshot', JSON, default={}),
-    Column('owner_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('is_last', UnsignedInt, default=0),
-    PrimaryKeyConstraint('id', 'version') )
+    "process_version_archive",
+    metadata,
+    Column("id", UnsignedInt, autoincrement=True, nullable=False),
+    Column("ps_id", UnsignedInt, ForeignKey("process_schema.id"), nullable=False),
+    Column("version", UnsignedInt, default=1, nullable=False),
+    Column("snapshot", JSON, default={}),
+    Column("owner_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("is_last", UnsignedInt, default=0),
+    PrimaryKeyConstraint("id", "version"),
+)
+
 
 class NodeStatus(str, Enum):
     ACTIVE = auto()
     DISABLED = auto()
     DELETED = auto()
 
+
 class NodeType(Enum):
-    TYPE1 = 'Type1'
-    TYPE2 = 'Type2'
-    TYPE3 = 'Type3'
+    TYPE1 = "Type1"
+    TYPE2 = "Type2"
+    TYPE3 = "Type3"
+
 
 ps_node_table = Table(
-    'ps_node', metadata,
-    Column('id', UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
-    Column('ps_id', UnsignedInt, ForeignKey('process_schema.id'), nullable=False),
-    Column('node_type', SQLAEnum(NodeType), nullable=False),
-    Column('settings', JSON, default={}),
-    Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('status', SQLAEnum(NodeStatus), nullable=False),
-
-    Index('idx_ps_id', 'ps_id')
+    "ps_node",
+    metadata,
+    Column("id", UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
+    Column("ps_id", UnsignedInt, ForeignKey("process_schema.id"), nullable=False),
+    Column("node_type", SQLAEnum(NodeType), nullable=False),
+    Column("settings", JSON, default={}),
+    Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("status", SQLAEnum(NodeStatus), nullable=False),
+    Index("idx_ps_id", "ps_id"),
 )
 
+
 class NodeLinkStatus(str, Enum):
     ACTIVE = auto()
     STOPPING = auto()
     STOPPED = auto()
     DELETED = auto()
 
-node_link_table = Table(
-    'node_link', metadata,
-    Column('id', UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
-    Column('link_name', String(20), nullable=False),
-    Column('node_id', UnsignedInt, ForeignKey('ps_node.id'), nullable=False),
-    Column('next_node_id', UnsignedInt, ForeignKey('ps_node.id'), nullable=False),
-    Column('settings', JSON, default={}),
-    Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
-    Column('created_at', DateTime(timezone=True), server_default=func.now()),
-    Column('status', SQLAEnum(NodeLinkStatus),nullable=False),
 
-    Index('idx_node_id', 'node_id'),
-    Index('idx_next_node_id', 'next_node_id'))
+node_link_table = Table(
+    "node_link",
+    metadata,
+    Column("id", UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
+    Column("link_name", String(20), nullable=False),
+    Column("node_id", UnsignedInt, ForeignKey("ps_node.id"), nullable=False),
+    Column("next_node_id", UnsignedInt, ForeignKey("ps_node.id"), nullable=False),
+    Column("settings", JSON, default={}),
+    Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False),
+    Column("created_at", DateTime(timezone=True), server_default=func.now()),
+    Column("status", SQLAEnum(NodeLinkStatus), nullable=False),
+    Index("idx_node_id", "node_id"),
+    Index("idx_next_node_id", "next_node_id"),
+)

api/api/endpoints/__init__.py

@@ -2,11 +2,8 @@ from api.endpoints.auth import api_router as auth_router
 from api.endpoints.profile import api_router as profile_router
 from api.endpoints.account import api_router as account_router
 from api.endpoints.keyring import api_router as keyring_router
-list_of_routes = [
-    auth_router,
-    profile_router,
-    account_router,
-    keyring_router]
+
+list_of_routes = [auth_router, profile_router, account_router, keyring_router]
 
 __all__ = [
     "list_of_routes",

api/api/endpoints/account.py

@@ -14,9 +14,9 @@ from sqlalchemy.ext.asyncio import AsyncConnection
 
 from api.db.connection.session import get_connection_dep
 
-from api.db.logic.account import get_user_id, update_user_id, create_user,get_user_login
+from api.db.logic.account import get_user_id, update_user_id, create_user, get_user_login
 
-from api.schemas.account.account import User,Status
+from api.schemas.account.account import User, Status
 from api.schemas.endpoints.account import UserUpdate
 
 
@@ -30,34 +30,21 @@ api_router = APIRouter(
 )
 
 
-
-@api_router.get("/{user_id}")
-async def get_account(user_id: int,
-                    request: Request,
-                    connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
-
+@api_router.get("/{user_id}", response_model=User)
+async def get_account(user_id: int, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
     current_user = request.state.current_user
     authorize_user = await db_user_role_validation(connection, current_user)
 
     user = await get_user_id(connection, user_id)
 
     if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Account not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
     return user
 
 
 @api_router.post("")
-async def create_account(
-                        user: UserUpdate,
-                        request: Request,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+async def create_account(user: UserUpdate, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
@@ -65,40 +52,29 @@ async def create_account(
     user_validation = await get_user_login(connection, user.login)
 
     if user_validation is None:
-
-        await create_user(connection,user,authorize_user.id)
+        await create_user(connection, user, authorize_user.id)
         user_new = await get_user_login(connection, user.login)
         return user_new
 
     else:
         raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="An account with this information already exists.")
-
-
+            status_code=status.HTTP_400_BAD_REQUEST, detail="An account with this information already exists."
+        )
 
 
 @api_router.put("/{user_id}")
 async def update_account(
-                        user_id: int,
-                        request: Request,
-                        user_update: UserUpdate,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+    user_id: int, request: Request, user_update: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep)
+):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
-
     user = await get_user_id(connection, user_id)
     if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Account not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
-
-    update_values = update_user_data_changes(user_update,user)
+    update_values = update_user_data_changes(user_update, user)
 
     if update_values is None:
         return user
@@ -107,42 +83,30 @@ async def update_account(
 
     await update_user_id(connection, update_values, user)
 
-
     user = await get_user_id(connection, user_id)
 
     return user
 
+
 @api_router.delete("/{user_id}")
-async def delete_account(
-                        user_id: int,
-                        request: Request,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
-
+async def delete_account(user_id: int, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
-
     user = await get_user_id(connection, user_id)
     if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Account not found")
-
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
     user_update = UserUpdate(status=Status.DELETED.value)
 
-    update_values = update_user_data_changes(user_update,user)
+    update_values = update_user_data_changes(user_update, user)
 
     if update_values is None:
         return user
 
-
     await update_user_id(connection, update_values, user)
 
-
     user = await get_user_id(connection, user_id)
 
     return user

api/api/endpoints/auth.py

@@ -11,9 +11,7 @@ from fastapi import (
     status,
 )
 
-
 from loguru import logger
-from pydantic.main import BaseModel
 from fastapi_jwt_auth import AuthJWT
 
 from pydantic import BaseModel
@@ -24,9 +22,9 @@ from api.config import get_settings
 from api.db.connection.session import get_connection_dep
 from api.services.auth import authenticate_user
 
-from api.db.logic.auth import add_new_refresh_token,upgrade_old_refresh_token
+from api.db.logic.auth import add_new_refresh_token, upgrade_old_refresh_token
 
-from api.schemas.endpoints.auth import Auth
+from api.schemas.endpoints.auth import Auth, AccessToken
 
 api_router = APIRouter(
     prefix="/auth",
@@ -58,8 +56,7 @@ async def login_for_access_token(
     response: Response,
     connection: AsyncConnection = Depends(get_connection_dep),
     Authorize: AuthJWT = Depends(),
-                            ):
-
+):
     """Авторизирует, выставляет токены в куки."""
 
     user = await authenticate_user(connection, user.login, user.password)
@@ -73,44 +70,28 @@ async def login_for_access_token(
             # headers={"WWW-Authenticate": "Bearer"},
         )
 
-    access_token_expires = timedelta(
-        minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
+    access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
 
-    refresh_token_expires = timedelta(
-        days=get_settings().REFRESH_TOKEN_EXPIRE_DAYS
-    )
+    refresh_token_expires = timedelta(days=get_settings().REFRESH_TOKEN_EXPIRE_DAYS)
 
     logger.debug(f"refresh_token_expires {refresh_token_expires}")
 
-    access_token = Authorize.create_access_token(
-        subject=user.login, expires_time=access_token_expires
-    )
-    refresh_token = Authorize.create_refresh_token(
-        subject=user.login, expires_time=refresh_token_expires
-    )
+    access_token = Authorize.create_access_token(subject=user.login, expires_time=access_token_expires)
+    refresh_token = Authorize.create_refresh_token(subject=user.login, expires_time=refresh_token_expires)
 
     refresh_token_expires_time = datetime.now(timezone.utc) + refresh_token_expires
 
-    await add_new_refresh_token(connection,refresh_token,refresh_token_expires_time,user)
+    await add_new_refresh_token(connection, refresh_token, refresh_token_expires_time, user)
 
     Authorize.set_refresh_cookies(refresh_token)
 
-
-    return {
-            "access_token": access_token,
-            # "access_token_expires": access_token_expires_time,
-            # "refresh_token": refresh_token,
-            # "refresh_token_expires": refresh_token_expires_time
-            }
+    return AccessToken(access_token=access_token)
 
 
 @api_router.post("/refresh")
 async def refresh(
-                    request: Request,
-                    connection: AsyncConnection = Depends(get_connection_dep),
-                    Authorize: AuthJWT = Depends()
-                    ):
-
+    request: Request, connection: AsyncConnection = Depends(get_connection_dep), Authorize: AuthJWT = Depends()
+):
     refresh_token = request.cookies.get("refresh_token_cookie")
     # print("Refresh Token:", refresh_token)
 
@@ -118,14 +99,11 @@ async def refresh(
         raise HTTPException(status_code=401, detail="Refresh token is missing")
 
     try:
-
         Authorize.jwt_refresh_token_required()
         current_user = Authorize.get_jwt_subject()
 
-
     except Exception as e:
-
-        await upgrade_old_refresh_token(connection,current_user,refresh_token)
+        await upgrade_old_refresh_token(connection, current_user, refresh_token)
 
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -134,13 +112,6 @@ async def refresh(
 
     access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
 
-    new_access_token = Authorize.create_access_token(
-        subject=current_user, expires_time=access_token_expires
-    )
+    new_access_token = Authorize.create_access_token(subject=current_user, expires_time=access_token_expires)
 
-    return {
-            "access_token": new_access_token,
-            # "access_token_expires": access_token_expires_time,
-            # "refresh_token": refresh_token,
-            # "refresh_token_expires": refresh_token_expires_time
-            }
+    return AccessToken(access_token=new_access_token)

api/api/endpoints/keyring.py

@@ -14,7 +14,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection
 
 from api.db.connection.session import get_connection_dep
 
-from api.db.logic.keyring import get_key_id,create_key,update_key_id
+from api.db.logic.keyring import get_key_id, create_key, update_key_id
 
 
 from api.schemas.account.account import Status
@@ -33,12 +33,7 @@ api_router = APIRouter(
 
 
 @api_router.get("/{user_id}/{key_id}")
-async def get_keyring(
-                    key_id: str,
-                    request: Request,
-                    connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+async def get_keyring(key_id: str, request: Request, connection: AsyncConnection = Depends(get_connection_dep)):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
@@ -46,9 +41,7 @@ async def get_keyring(
     keyring = await get_key_id(connection, key_id)
 
     if keyring is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Key not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Key not found")
 
     return keyring
 
@@ -59,9 +52,8 @@ async def create_keyring(
     key_id: str,
     request: Request,
     key: AccountKeyringUpdate,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+    connection: AsyncConnection = Depends(get_connection_dep),
+):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
@@ -69,14 +61,17 @@ async def create_keyring(
     keyring = await get_key_id(connection, key_id)
 
     if keyring is None:
-        user_new = await create_key(connection,key, key_id, )
+        user_new = await create_key(
+            connection,
+            key,
+            key_id,
+        )
         return user_new
 
     else:
         raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="An keyring with this information already exists.")
-
+            status_code=status.HTTP_400_BAD_REQUEST, detail="An keyring with this information already exists."
+        )
 
 
 @api_router.put("/{user_id}/{key_id}")
@@ -85,66 +80,51 @@ async def update_keyring(
     key_id: str,
     request: Request,
     keyring_update: AccountKeyringUpdate,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+    connection: AsyncConnection = Depends(get_connection_dep),
+):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
-
     keyring = await get_key_id(connection, key_id)
     if keyring is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="keyring not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
 
-
-    update_values = update_key_data_changes(keyring_update,keyring)
+    update_values = update_key_data_changes(keyring_update, keyring)
 
     if update_values is None:
         return keyring
 
     keyring_update_data = AccountKeyring.model_validate({**keyring.model_dump(), **update_values})
 
-
     await update_key_id(connection, update_values, keyring)
 
-
     keyring = await get_key_id(connection, key_id)
 
     return keyring
 
+
 @api_router.delete("/{user_id}/{key_id}")
 async def delete_keyring(
-                        user_id: int,
-                        key_id: str,
-                        request: Request,
-                        connection: AsyncConnection = Depends(get_connection_dep)
-                    ):
-
+    user_id: int, key_id: str, request: Request, connection: AsyncConnection = Depends(get_connection_dep)
+):
     current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
-
     keyring = await get_key_id(connection, key_id)
     if keyring is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="keyring not found")
-
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
 
     keyring_update = AccountKeyringUpdate(status=Status.DELETED.value)
 
-    update_values = update_key_data_changes(keyring_update,keyring)
+    update_values = update_key_data_changes(keyring_update, keyring)
 
     if update_values is None:
         return keyring
 
     await update_key_id(connection, update_values, keyring)
 
-
     keyring = await get_key_id(connection, key_id)
 
     return keyring

api/api/endpoints/profile.py

@@ -13,13 +13,12 @@ from fastapi import (
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from api.db.connection.session import get_connection_dep
-from api.db.logic.account import get_user_id, update_user_id,get_user_login
+from api.db.logic.account import get_user_id, update_user_id, get_user_login
 from api.services.update_data_validation import update_user_data_changes
 
 from api.schemas.endpoints.account import UserUpdate
 
 
-
 api_router = APIRouter(
     prefix="/profile",
     tags=["User accountModel"],
@@ -30,16 +29,14 @@ api_router = APIRouter(
 async def get_profile(
     request: Request,
     connection: AsyncConnection = Depends(get_connection_dep),
-                    ):
+):
     # Извлекаем текущего пользователя из request.state
     current_user = request.state.current_user
 
     user = await get_user_login(connection, current_user)
 
     if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Account not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
     return user
 
@@ -49,19 +46,15 @@ async def update_profile(
     request: Request,
     user_updata: UserUpdate,
     connection: AsyncConnection = Depends(get_connection_dep),
-
-                    ):
-
+):
     current_user = request.state.current_user
 
     user = await get_user_login(connection, current_user)
     if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Account not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
     if user_updata.role == None and user_updata.login == None:
-            update_values = update_user_data_changes(user_updata,user)
+        update_values = update_user_data_changes(user_updata, user)
 
         if update_values is None:
             return user
@@ -72,6 +65,4 @@ async def update_profile(
 
         return user
     else:
-            raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY ,
-            detail="Bad body")
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="Bad body")

api/api/schemas/account/account.py

@@ -2,23 +2,29 @@ import datetime
 from enum import Enum
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, EmailStr, Field
+from pydantic import EmailStr, Field
+
+from api.schemas.base import Base
+
 
 # Модель для хранения информации из запроса
 
+
 class Role(Enum):
-    OWNER = 'OWNER'
-    ADMIN = 'ADMIN'
-    EDITOR = 'EDITOR'
-    VIEWER = 'VIEWER'
+    OWNER = "OWNER"
+    ADMIN = "ADMIN"
+    EDITOR = "EDITOR"
+    VIEWER = "VIEWER"
+
 
 class Status(Enum):
-    ACTIVE = 'ACTIVE'
-    DISABLED = 'DISABLED'
-    BLOCKED = 'BLOCKED'
-    DELETED = 'DELETED'
+    ACTIVE = "ACTIVE"
+    DISABLED = "DISABLED"
+    BLOCKED = "BLOCKED"
+    DELETED = "DELETED"
 
-class User(BaseModel):
+
+class User(Base):
     id: Optional[int] = None
     name: str = Field(..., max_length=100)
     login: str = Field(..., max_length=100)

api/api/schemas/account/account_keyring.py

@@ -1,24 +1,29 @@
 import datetime
 from enum import Enum
 from typing import Optional, Dict
-from pydantic import BaseModel, Field
+from pydantic import Field
 from datetime import datetime
 
+from api.schemas.base import Base
+
+
 # Модель для хранения информации из запроса
 
+
 class TypeKey(Enum):
     PASSWORD = "PASSWORD"
     ACCESS_TOKEN = "ACCESS_TOKEN"
     REFRESH_TOKEN = "REFRESH_TOKEN"
     API_KEY = "API_KEY"
 
+
 class StatusKey(Enum):
     ACTIVE = "ACTIVE"
     EXPIRED = "EXPIRED"
     DELETED = "DELETED"
 
 
-class AccountKeyring(BaseModel):
+class AccountKeyring(Base):
     owner_id: int
     key_type: TypeKey  # Используем тот же KeyType
     key_id: Optional[str] = Field(None, max_length=40)  # Изменено на None как default

api/api/schemas/base.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel, ConfigDict
+from pydantic.alias_generators import to_camel
+
+
+class Base(BaseModel):
+    model_config = ConfigDict(
+        from_attributes=True,
+        alias_generator=to_camel,
+        populate_by_name=True,
+    )

api/api/schemas/endpoints/account.py

@@ -1,23 +1,29 @@
 from enum import Enum
 from typing import Optional
 from datetime import datetime
-from pydantic import BaseModel, EmailStr, Field
+from pydantic import EmailStr, Field
+
+from api.schemas.base import Base
+
 
 # Таблица для получения информации из запроса
 
+
 class Role(Enum):
-    OWNER = 'OWNER'
-    ADMIN = 'ADMIN'
-    EDITOR = 'EDITOR'
-    VIEWER = 'VIEWER'
+    OWNER = "OWNER"
+    ADMIN = "ADMIN"
+    EDITOR = "EDITOR"
+    VIEWER = "VIEWER"
+
 
 class Status(Enum):
-    ACTIVE = 'ACTIVE'
-    DISABLED = 'DISABLED'
-    BLOCKED = 'BLOCKED'
-    DELETED = 'DELETED'
+    ACTIVE = "ACTIVE"
+    DISABLED = "DISABLED"
+    BLOCKED = "BLOCKED"
+    DELETED = "DELETED"
 
-class UserUpdate(BaseModel):
+
+class UserUpdate(Base):
     id: Optional[int] = None
     name: Optional[str] = Field(None, max_length=100)
     login: Optional[str] = Field(None, max_length=100)

api/api/schemas/endpoints/account_keyring.py

@@ -1,24 +1,29 @@
 import datetime
 from enum import Enum
 from typing import Optional
-from pydantic import BaseModel, Field
+from pydantic import Field
 from datetime import datetime
 
+from api.schemas.base import Base
+
+
 # Таблица для получения информации из запроса
 
+
 class TypeKey(Enum):
     PASSWORD = "PASSWORD"
     ACCESS_TOKEN = "ACCESS_TOKEN"
     REFRESH_TOKEN = "REFRESH_TOKEN"
     API_KEY = "API_KEY"
 
+
 class StatusKey(Enum):
     ACTIVE = "ACTIVE"
     EXPIRED = "EXPIRED"
     DELETED = "DELETED"
 
 
-class AccountKeyringUpdate(BaseModel):
+class AccountKeyringUpdate(Base):
     owner_id: Optional[int] = None
     key_type: Optional[TypeKey] = None
     key_id: Optional[str] = Field(None, max_length=40)

api/api/schemas/endpoints/auth.py

@@ -1,11 +1,17 @@
-from pydantic import BaseModel
+from api.schemas.base import Base
+
 
 # Таблица для получения информации из запроса
 
-class Auth(BaseModel):
+
+class Auth(Base):
     login: str
     password: str
 
 
-class Refresh(BaseModel):
+class AccessToken(Base):
+    access_token: str
+
+
+class Refresh(Base):
     refresh_token: str

api/api/schemas/events/list_events.py

@@ -1,8 +1,10 @@
-from pydantic import BaseModel, Field
+from pydantic import Field
 from typing import Dict, Any
 from datetime import datetime
 from enum import Enum
 
+from api.schemas.base import Base
+
 
 class State(Enum):
     AUTO = "Auto"
@@ -14,7 +16,8 @@ class Status(Enum):
     DISABLED = "Disabled"
     DELETED = "Deleted"
 
-class ListEvent(BaseModel):
+
+class ListEvent(Base):
     id: int
     name: str = Field(..., max_length=40)
     title: str = Field(..., max_length=64)

api/api/schemas/process/node_link.py

@@ -1,15 +1,19 @@
-from pydantic import BaseModel, Field, conint
+from pydantic import Field, conint
 from typing import Dict, Any
 from datetime import datetime
 from enum import Enum
 
+from api.schemas.base import Base
+
+
 class Status(Enum):
     ACTIVE = "Active"
     STOPPING = "Stopping"
     STOPPED = "Stopped"
     DELETED = "Deleted"
 
-class MyModel(BaseModel):
+
+class MyModel(Base):
     id: int
     link_name: str = Field(..., max_length=20)
     node_id: int

api/api/schemas/process/process_schema.py

@@ -1,15 +1,19 @@
-from pydantic import BaseModel, Field
+from pydantic import Field
 from typing import Dict, Any
 from datetime import datetime
 from enum import Enum
 
+from api.schemas.base import Base
+
+
 class Status(Enum):
     ACTIVE = "Active"
     STOPPING = "Stopping"
     STOPPED = "Stopped"
     DELETED = "Deleted"
 
-class ProcessSchema(BaseModel):
+
+class ProcessSchema(Base):
     id: int
     title: str = Field(..., max_length=100)
     description: str

api/api/schemas/process/process_version_archive.py

@@ -1,8 +1,10 @@
-from pydantic import BaseModel, Field
 from typing import Dict, Any
 from datetime import datetime
 
-class ProcessStatusSchema(BaseModel):
+from api.schemas.base import Base
+
+
+class ProcessStatusSchema(Base):
     id: int
     version: int
     snapshot: Dict[str, Any]

api/api/schemas/process/ps_node.py

@@ -1,19 +1,21 @@
-from pydantic import BaseModel
 from datetime import datetime
 from typing import Dict, Any
 from enum import Enum
 
+from api.schemas.base import Base
+
 
 class NodeType(Enum):
-
     pass
 
+
 class Status(Enum):
     ACTIVE = "Active"
     DISABLED = "Disabled"
     DELETED = "Deleted"
 
-class Ps_Node(BaseModel):
+
+class Ps_Node(Base):
     id: int
     ps_id: int
     node_type: NodeType

api/api/services/auth.py

@@ -1,20 +1,16 @@
 from typing import Optional
 from sqlalchemy.ext.asyncio import AsyncConnection
 from api.db.logic.auth import get_user
+
 # # from backend.schemas.users.token import TokenData
-from api.schemas.account.account import User,Status
+from api.schemas.account.account import User, Status
 from api.utils.hasher import Hasher
 
 
+async def authenticate_user(connection: AsyncConnection, username: str, password: str) -> Optional[User]:
+    sql_user, sql_password = await get_user(connection, username)
 
-
-async def authenticate_user(
-    connection: AsyncConnection, username: str, password: str
-) -> Optional[User]:
-
-    sql_user,sql_password = await get_user(connection, username)
-
-    if not sql_user or sql_user.status != Status.ACTIVE :
+    if not sql_user or sql_user.status != Status.ACTIVE:
         return None
     hasher = Hasher()
     if not hasher.verify_data(password, sql_password.key_value):

api/api/services/middleware.py

@@ -14,34 +14,27 @@ from re import escape
 from fastapi_jwt_auth import AuthJWT
 
 
-
 class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
     def __init__(self, app):
         super().__init__(app)
 
         self.prefix = escape(get_settings().PATH_PREFIX)
         self.excluded_routes = [
-            re.compile(r'^' + re.escape(self.prefix) + r'/auth/refresh/?$'),
-            re.compile(r'^' + re.escape(self.prefix) + r'/auth/?$')
+            re.compile(r"^" + re.escape(self.prefix) + r"/auth/refresh/?$"),
+            re.compile(r"^" + re.escape(self.prefix) + r"/auth/?$"),
         ]
 
-
-
-    async def dispatch(self,
-                       request: Request,
-                       call_next):
-
+    async def dispatch(self, request: Request, call_next):
         if request.method in ["GET", "POST", "PUT", "DELETE"]:
             if any(pattern.match(request.url.path) for pattern in self.excluded_routes):
                 return await call_next(request)
             else:
-
                 auth_header = request.headers.get("Authorization")
                 if not auth_header:
                     return JSONResponse(
                         status_code=status.HTTP_401_UNAUTHORIZED,
                         content={"detail": "Missing authorization header."},
-                                    headers={"WWW-Authenticate": "Bearer"}
+                        headers={"WWW-Authenticate": "Bearer"},
                     )
 
                 token = auth_header.split(" ")[1]
@@ -56,11 +49,9 @@ class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
                     return JSONResponse(
                         status_code=status.HTTP_401_UNAUTHORIZED,
                         content={"detail": "The access token is invalid or expired."},
-                            headers={"WWW-Authenticate": "Bearer"}
+                        headers={"WWW-Authenticate": "Bearer"},
                     )
 
-
-
                 # async with get_connection() as connection:
                 #     authorize_user = await get_user_login(connection, current_user)
                 # print(authorize_user)

api/api/services/update_data_validation.py

@@ -3,6 +3,7 @@ from typing import Optional
 from api.schemas.endpoints.account import UserUpdate, Role, Status
 from api.schemas.endpoints.account_keyring import AccountKeyringUpdate, StatusKey, TypeKey
 
+
 def update_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
     """
     Сравнивает данные для обновления с текущими значениями пользователя.
@@ -36,6 +37,7 @@ def update_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
 
     return changes if changes else None
 
+
 def update_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
     """
     Сравнивает данные для обновления с текущими значениями пользователя.

api/api/services/user_role_validation.py

@@ -3,13 +3,11 @@ from fastapi import (
     status,
 )
 from api.db.logic.account import get_user_login
-from api.schemas.account.account import Role,Status
+from api.schemas.account.account import Role, Status
+
 
 async def db_user_role_validation(connection, current_user):
-
     authorize_user = await get_user_login(connection, current_user)
     if authorize_user.role not in {Role.OWNER, Role.ADMIN}:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="You do not have enough permissions")
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="You do not have enough permissions")
     return authorize_user

api/api/utils/hasher.py

@@ -2,6 +2,7 @@ import hashlib
 
 # Хешер для работы с паролем.
 
+
 class Hasher:
     def __init__(self):
         pass

api/api/utils/key_id_gen.py

@@ -3,6 +3,7 @@ from datetime import datetime
 
 # Генератор key_id для таблицы account_keyring
 
+
 def KeyIdGenerator():
     random_number = random.randint(1000, 9999)
     result = f"{datetime.now().strftime('%Y-%m-%d')}-{random_number}"

api/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
 
 [[package]]
 name = "aio-pika"
@@ -1052,6 +1052,34 @@ files = [
     {file = "python_multipart-0.0.20.tar.gz", hash = "sha256:8dd0cab45b8e23064ae09147625994d090fa46f5b0d1e13af944c331a7fa9d13"},
 ]
 
+[[package]]
+name = "ruff"
+version = "0.11.10"
+description = "An extremely fast Python linter and code formatter, written in Rust."
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "ruff-0.11.10-py3-none-linux_armv6l.whl", hash = "sha256:859a7bfa7bc8888abbea31ef8a2b411714e6a80f0d173c2a82f9041ed6b50f58"},
+    {file = "ruff-0.11.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:968220a57e09ea5e4fd48ed1c646419961a0570727c7e069842edd018ee8afed"},
+    {file = "ruff-0.11.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1067245bad978e7aa7b22f67113ecc6eb241dca0d9b696144256c3a879663bca"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4854fd09c7aed5b1590e996a81aeff0c9ff51378b084eb5a0b9cd9518e6cff2"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b4564e9f99168c0f9195a0fd5fa5928004b33b377137f978055e40008a082c5"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b6a9cc5b62c03cc1fea0044ed8576379dbaf751d5503d718c973d5418483641"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:607ecbb6f03e44c9e0a93aedacb17b4eb4f3563d00e8b474298a201622677947"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7b3a522fa389402cd2137df9ddefe848f727250535c70dafa840badffb56b7a4"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f071b0deed7e9245d5820dac235cbdd4ef99d7b12ff04c330a241ad3534319f"},
+    {file = "ruff-0.11.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a60e3a0a617eafba1f2e4186d827759d65348fa53708ca547e384db28406a0b"},
+    {file = "ruff-0.11.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:da8ec977eaa4b7bf75470fb575bea2cb41a0e07c7ea9d5a0a97d13dbca697bf2"},
+    {file = "ruff-0.11.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:ddf8967e08227d1bd95cc0851ef80d2ad9c7c0c5aab1eba31db49cf0a7b99523"},
+    {file = "ruff-0.11.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:5a94acf798a82db188f6f36575d80609072b032105d114b0f98661e1679c9125"},
+    {file = "ruff-0.11.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:3afead355f1d16d95630df28d4ba17fb2cb9c8dfac8d21ced14984121f639bad"},
+    {file = "ruff-0.11.10-py3-none-win32.whl", hash = "sha256:dc061a98d32a97211af7e7f3fa1d4ca2fcf919fb96c28f39551f35fc55bdbc19"},
+    {file = "ruff-0.11.10-py3-none-win_amd64.whl", hash = "sha256:5cc725fbb4d25b0f185cb42df07ab6b76c4489b4bfb740a175f3a59c70e8a224"},
+    {file = "ruff-0.11.10-py3-none-win_arm64.whl", hash = "sha256:ef69637b35fb8b210743926778d0e45e1bffa850a7c61e428c6b971549b5f5d1"},
+    {file = "ruff-0.11.10.tar.gz", hash = "sha256:d522fb204b4959909ecac47da02830daec102eeb100fb50ea9554818d47a5fa6"},
+]
+
 [[package]]
 name = "sniffio"
 version = "1.3.1"
@@ -1342,4 +1370,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.11,<4.0"
-content-hash = "146687a6e082e27748cc339242d924d2fb0741f7f2eb842a025e137f5fb41378"
+content-hash = "22129fa3f5a2cc1190af6c7645f3dd8b4ab0f873b120987cd2e06772863e7dc8"

api/pyproject.toml

@@ -25,3 +25,10 @@ dependencies = [
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.group.dev.dependencies]
+ruff = "^0.11.10"
+
+[tool.ruff]
+line-length = 120
+extend-exclude = ["alembic"]

client/package.json

@@ -1,8 +1,9 @@
 {
   "name": "client",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "private": true,
   "dependencies": {
+    "@ant-design/icons": "^5.6.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
@@ -11,8 +12,13 @@
     "@types/node": "^16.18.126",
     "@types/react": "^19.0.11",
     "@types/react-dom": "^19.0.4",
+    "antd": "^5.24.7",
+    "i18next": "^25.0.1",
+    "i18next-browser-languagedetector": "^8.0.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-i18next": "^15.5.1",
+    "react-router-dom": "^7.5.0",
     "react-scripts": "5.0.1",
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4"

client/public/icons/drawer/add_photo_alternate.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 18C1.45 18 0.979167 17.8042 0.5875 17.4125C0.195833 17.0208 0 16.55 0 16V2C0 1.45 0.195833 0.979167 0.5875 0.5875C0.979167 0.195833 1.45 0 2 0H10V2H2V16H16V8H18V16C18 16.55 17.8042 17.0208 17.4125 17.4125C17.0208 17.8042 16.55 18 16 18H2ZM3 14H15L11.25 9L8.25 13L6 10L3 14ZM14 6V4H12V2H14V0H16V2H18V4H16V6H14Z" fill="#606060"/>
+</svg>

client/public/icons/drawer/arrow_back.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.825 9L9.425 14.6L8 16L0 8L8 0L9.425 1.4L3.825 7H16V9H3.825Z" fill="#606060"/>
+</svg>

client/public/icons/drawer/delete.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 18C2.45 18 1.97917 17.8042 1.5875 17.4125C1.19583 17.0208 1 16.55 1 16V3H0V1H5V0H11V1H16V3H15V16C15 16.55 14.8042 17.0208 14.4125 17.4125C14.0208 17.8042 13.55 18 13 18H3ZM13 3H3V16H13V3ZM5 14H7V5H5V14ZM9 14H11V5H9V14Z" fill="#FF0000"/>
+</svg>

client/public/icons/drawer/reg.svg

@@ -0,0 +1,3 @@
+<svg width="21" height="17" viewBox="0 0 21 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.5 16V13.2C0.5 12.65 0.641667 12.1333 0.925 11.65C1.20833 11.1667 1.6 10.8 2.1 10.55C2.95 10.1167 3.90833 9.75 4.975 9.45C6.04167 9.15 7.21667 9 8.5 9C9 9 9.4875 9.025 9.9625 9.075C10.4375 9.125 10.9 9.2 11.35 9.3L9.6 11.05C9.41667 11.0167 9.2375 11 9.0625 11H8.5C7.31667 11 6.25417 11.1417 5.3125 11.425C4.37083 11.7083 3.6 12.0167 3 12.35C2.85 12.4333 2.72917 12.55 2.6375 12.7C2.54583 12.85 2.5 13.0167 2.5 13.2V14H8.75L10.75 16H0.5ZM14.05 16.4L10.6 12.95L12 11.55L14.05 13.6L19.1 8.55L20.5 9.95L14.05 16.4ZM8.5 8C7.4 8 6.45833 7.60833 5.675 6.825C4.89167 6.04167 4.5 5.1 4.5 4C4.5 2.9 4.89167 1.95833 5.675 1.175C6.45833 0.391667 7.4 0 8.5 0C9.6 0 10.5417 0.391667 11.325 1.175C12.1083 1.95833 12.5 2.9 12.5 4C12.5 5.1 12.1083 6.04167 11.325 6.825C10.5417 7.60833 9.6 8 8.5 8ZM8.5 6C9.05 6 9.52083 5.80417 9.9125 5.4125C10.3042 5.02083 10.5 4.55 10.5 4C10.5 3.45 10.3042 2.97917 9.9125 2.5875C9.52083 2.19583 9.05 2 8.5 2C7.95 2 7.47917 2.19583 7.0875 2.5875C6.69583 2.97917 6.5 3.45 6.5 4C6.5 4.55 6.69583 5.02083 7.0875 5.4125C7.47917 5.80417 7.95 6 8.5 6Z" fill="#606060"/>
+</svg>

client/public/icons/drawer/save.svg

@@ -0,0 +1,3 @@
+<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5 4V16C18.5 16.55 18.3042 17.0208 17.9125 17.4125C17.5208 17.8042 17.05 18 16.5 18H2.5C1.95 18 1.47917 17.8042 1.0875 17.4125C0.695833 17.0208 0.5 16.55 0.5 16V2C0.5 1.45 0.695833 0.979167 1.0875 0.5875C1.47917 0.195833 1.95 0 2.5 0H14.5L18.5 4ZM16.5 4.85L13.65 2H2.5V16H16.5V4.85ZM9.5 15C10.3333 15 11.0417 14.7083 11.625 14.125C12.2083 13.5417 12.5 12.8333 12.5 12C12.5 11.1667 12.2083 10.4583 11.625 9.875C11.0417 9.29167 10.3333 9 9.5 9C8.66667 9 7.95833 9.29167 7.375 9.875C6.79167 10.4583 6.5 11.1667 6.5 12C6.5 12.8333 6.79167 13.5417 7.375 14.125C7.95833 14.7083 8.66667 15 9.5 15ZM3.5 7H12.5V3H3.5V7Z" fill="#606060"/>
+</svg>

client/public/icons/header/add_2.svg

@@ -0,0 +1,3 @@
+<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.125 18V10H0.125V8H8.125V0H10.125V8H18.125V10H10.125V18H8.125Z" fill="#606060"/>
+</svg>

client/public/icons/header/more.svg

@@ -0,0 +1,3 @@
+<svg width="4" height="16" viewBox="0 0 4 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4C3.1 4 4 3.1 4 2C4 0.9 3.1 0 2 0C0.9 0 0 0.9 0 2C0 3.1 0.9 4 2 4ZM2 6C0.9 6 0 6.9 0 8C0 9.1 0.9 10 2 10C3.1 10 4 9.1 4 8C4 6.9 3.1 6 2 6ZM2 12C0.9 12 0 12.9 0 14C0 15.1 0.9 16 2 16C3.1 16 4 15.1 4 14C4 12.9 3.1 12 2 12Z" fill="#606060"/>
+</svg>

client/public/icons/sider/menu.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="12" viewBox="0 0 18 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 12V10H18V12H0ZM0 7V5H18V7H0ZM0 2V0H18V2H0Z" fill="#606060"/>
+</svg>

client/public/icons/sider/menu_open.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="12" viewBox="0 0 18 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 12V10H13V12H0ZM16.6 11L11.6 6L16.6 1L18 2.4L14.4 6L18 9.6L16.6 11ZM0 7V5H10V7H0ZM0 2V0H13V2H0Z" fill="#606060"/>
+</svg>

client/public/icons/sider/process-diagram.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.4 19L12 17.6L13.575 16L12 14.425L13.4 13L15 14.6L16.575 13L18 14.425L16.4 16L18 17.6L16.575 19L15 17.425L13.4 19ZM3 17C3.28333 17 3.52083 16.9042 3.7125 16.7125C3.90417 16.5208 4 16.2833 4 16C4 15.7167 3.90417 15.4792 3.7125 15.2875C3.52083 15.0958 3.28333 15 3 15C2.71667 15 2.47917 15.0958 2.2875 15.2875C2.09583 15.4792 2 15.7167 2 16C2 16.2833 2.09583 16.5208 2.2875 16.7125C2.47917 16.9042 2.71667 17 3 17ZM3 19C2.16667 19 1.45833 18.7083 0.875 18.125C0.291667 17.5417 0 16.8333 0 16C0 15.1667 0.291667 14.4583 0.875 13.875C1.45833 13.2917 2.16667 13 3 13C3.61667 13 4.17917 13.1708 4.6875 13.5125C5.19583 13.8542 5.56667 14.3167 5.8 14.9C6.45 14.7167 6.97917 14.3583 7.3875 13.825C7.79583 13.2917 8 12.6833 8 12V8C8 6.61667 8.4875 5.4375 9.4625 4.4625C10.4375 3.4875 11.6167 3 13 3H14.15L12.575 1.425L14 0L18 4L14 8L12.575 6.6L14.15 5H13C12.1667 5 11.4583 5.29167 10.875 5.875C10.2917 6.45833 10 7.16667 10 8V12C10 13.2167 9.60833 14.2875 8.825 15.2125C8.04167 16.1375 7.05 16.7083 5.85 16.925C5.65 17.5417 5.2875 18.0417 4.7625 18.425C4.2375 18.8083 3.65 19 3 19ZM1.4 7L0 5.6L1.575 4L0 2.425L1.4 1L3 2.6L4.575 1L6 2.425L4.4 4L6 5.6L4.575 7L3 5.425L1.4 7Z" fill="#606060"/>
+</svg>

client/public/icons/sider/running-processes.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 16V14H9V9H7V11H0V5H7V7H9V2H13V0H20V6H13V4H11V12H13V10H20V16H13ZM15 14H18V12H15V14ZM2 9H5V7H2V9ZM15 4H18V2H15V4Z" fill="#606060"/>
+</svg>

client/public/icons/sider/settings.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 18V12H10V14H18V16H10V18H8ZM0 16V14H6V16H0ZM4 12V10H0V8H4V6H6V12H4ZM8 10V8H18V10H8ZM12 6V0H14V2H18V4H14V6H12ZM0 4V2H10V4H0Z" fill="#606060"/>
+</svg>

client/public/index.html

@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>VORKOUT</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

client/src/App.tsx

@@ -1,7 +1,19 @@
 import React from 'react';
+import { Route, Routes } from 'react-router-dom';
+import MainLayout from './pages/MainLayout';
+import ProtectedRoute from './pages/ProtectedRoute';
 
 function App() {
-  return <div className="App"></div>;
+  return (
+    <div className="App">
+      <Routes>
+        <Route path="/login" element={<div>login</div>} />
+        <Route element={<ProtectedRoute />}>
+          <Route path="*" element={<MainLayout />}></Route>
+        </Route>
+      </Routes>
+    </div>
+  );
 }
 
 export default App;

client/src/components/ContentDrawer.tsx

@@ -0,0 +1,161 @@
+import { Drawer } from 'antd';
+import { useEffect, useState } from 'react';
+import { Avatar, Typography } from 'antd';
+import { useTranslation } from 'react-i18next';
+
+interface ContentDrawerProps {
+  open: boolean;
+  closeDrawer: () => void;
+  children: React.ReactNode;
+  type: 'create' | 'edit';
+}
+
+export default function ContentDrawer({
+  open,
+  closeDrawer,
+  children,
+  type,
+}: ContentDrawerProps) {
+  const { t } = useTranslation();
+  const [width, setWidth] = useState<number | string>('30%');
+
+  const calculateWidths = () => {
+    const windowWidth = window.innerWidth;
+    const expanded = Math.max(windowWidth * 0.3, 300);
+    setWidth(expanded);
+  };
+
+  useEffect(() => {
+    calculateWidths();
+    window.addEventListener('resize', calculateWidths);
+    return () => window.removeEventListener('resize', calculateWidths);
+  }, []);
+
+  const editDrawerTitle = (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+        gap: 12,
+      }}
+    >
+      <div
+        onClick={closeDrawer}
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          height: '24px',
+          width: '24px',
+          cursor: 'pointer',
+        }}
+      >
+        <img
+          src="./icons/drawer/arrow_back.svg"
+          alt="close_drawer"
+          style={{ height: '16px', width: '16px' }}
+        />
+      </div>
+
+      <div style={{ display: 'flex', alignItems: 'center', gap: 12, flex: 1 }}>
+        <Avatar
+          src="https://cdn-icons-png.flaticon.com/512/219/219986.png"
+          size={40}
+          style={{ flexShrink: 0 }}
+        />
+        <div>
+          <Typography.Text strong style={{ display: 'block' }}>
+            Александр Александров
+          </Typography.Text>
+          <Typography.Text type="secondary" style={{ fontSize: 14 }}>
+            alexandralex@vorkout.ru
+          </Typography.Text>
+        </div>
+      </div>
+
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          height: '24px',
+          width: '24px',
+        }}
+      >
+        <img
+          src="./icons/drawer/delete.svg"
+          alt="delete"
+          style={{ height: '18px', width: '16px' }}
+        />
+      </div>
+    </div>
+  );
+
+  const createDrawerTitle = (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+        gap: 12,
+      }}
+    >
+      <div
+        onClick={closeDrawer}
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          height: '24px',
+          width: '24px',
+          cursor: 'pointer',
+        }}
+      >
+        <img
+          src="./icons/drawer/arrow_back.svg"
+          alt="close_drawer"
+          style={{ height: '16px', width: '16px' }}
+        />
+      </div>
+
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: 12,
+          flex: 1,
+          fontSize: '20px',
+        }}
+      >
+        {t('newAccount')}
+      </div>
+
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          height: '24px',
+          width: '24px',
+        }}
+        onClick={closeDrawer}
+      >
+        <img
+          src="./icons/drawer/delete.svg"
+          alt="delete"
+          style={{ height: '18px', width: '16px' }}
+        />
+      </div>
+    </div>
+  );
+
+  return (
+    <Drawer
+      title={type === 'create' ? createDrawerTitle : editDrawerTitle}
+      placement="right"
+      open={open}
+      width={width}
+      destroyOnClose={true}
+      closable={false}
+    >
+      {children}
+    </Drawer>
+  );
+}

client/src/components/Header.tsx

@@ -0,0 +1,55 @@
+import { Avatar } from 'antd';
+import Title from 'antd/es/typography/Title';
+
+interface HeaderProps {
+  title: string;
+  additionalContent?: React.ReactNode;
+}
+
+export default function Header({ title, additionalContent }: HeaderProps) {
+  return (
+    <div
+      style={{
+        height: '72px',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+      }}
+    >
+      <Title style={{ marginLeft: '16px' }} level={3}>
+        {title}
+      </Title>
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: '24px',
+          marginRight: '26px',
+        }}
+      >
+        {additionalContent}
+        <img
+          src="./icons/header/more.svg"
+          alt="more"
+          style={{ height: '16px', width: '16px' }}
+        />
+        <div
+          style={{
+            borderRadius: '50%',
+            border: '2px solid #8BC34A',
+            height: '32px',
+            width: '32px',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+          }}
+        >
+          <Avatar
+            size={25.77}
+            src={`https://cdn-icons-png.flaticon.com/512/219/219986.png`}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}

client/src/components/SiderMenu.tsx

@@ -0,0 +1,118 @@
+import { Divider, Menu, Tooltip } from 'antd';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+interface SiderMenuProps {
+  collapsed: boolean;
+  selectedKey: string;
+  hangleMenuClick: (e: any) => void;
+}
+
+export default function SiderMenu({
+  collapsed,
+  selectedKey,
+  hangleMenuClick,
+}: SiderMenuProps) {
+  const { t } = useTranslation();
+  const collapseStyle = collapsed
+    ? { fontSize: '12px' }
+    : { fontSize: '12px', paddingLeft: '52px' };
+
+  const menuItems = [
+    {
+      key: 'toggle',
+      icon: (
+        <img
+          src={
+            !collapsed
+              ? './icons/sider/menu_open.svg'
+              : './icons/sider/menu.svg'
+          }
+          alt="toggle"
+        />
+      ),
+      label: 'VORKOUT',
+      style: { fontSize: '20px' },
+    },
+    {
+      key: '/process-diagram',
+      icon: (
+        <img src="./icons/sider/process-diagram.svg" alt="process diagram" />
+      ),
+      label: (
+        <Tooltip title={t('processDiagrams')}>{t('processDiagrams')}</Tooltip>
+      ),
+    },
+    {
+      key: '/running-processes',
+      icon: (
+        <img
+          src="./icons/sider/running-processes.svg"
+          alt="running processes"
+        />
+      ),
+      label: (
+        <Tooltip title={t('runningProcesses')}>{t('runningProcesses')}</Tooltip>
+      ),
+    },
+    !collapsed
+      ? {
+          key: 'divider',
+          label: <Divider />,
+          style: {
+            marginBottom: '-16px',
+            marginTop: '-4px',
+            cursor: 'default',
+            width: '100%',
+          },
+          disabled: true,
+        }
+      : null,
+    {
+      key: 'sub1',
+      icon: <img src="./icons/sider/settings.svg" alt="settings" />,
+      label: t('settings'),
+      className: 'no-expand-icon',
+      children: [
+        {
+          key: '/accounts',
+          label: !collapsed ? (
+            <Tooltip title={t('accounts')}>{t('accounts')}</Tooltip>
+          ) : (
+            t('accounts')
+          ),
+          style: collapseStyle,
+        },
+        {
+          key: '/events-list',
+          label: !collapsed ? (
+            <Tooltip title={t('eventsList')}>{t('eventsList')}</Tooltip>
+          ) : (
+            t('eventsList')
+          ),
+          style: collapseStyle,
+        },
+        {
+          key: '/configuration',
+          label: !collapsed ? (
+            <Tooltip title={t('configuration')}>{t('configuration')}</Tooltip>
+          ) : (
+            t('configuration')
+          ),
+          style: collapseStyle,
+        },
+      ],
+    },
+  ];
+
+  return (
+    <Menu
+      theme="light"
+      selectedKeys={[selectedKey]}
+      mode="inline"
+      onClick={hangleMenuClick}
+      defaultOpenKeys={['sub1']}
+      items={menuItems}
+    />
+  );
+}

client/src/components/UserCreate.tsx

@@ -0,0 +1,229 @@
+import {
+  Button,
+  Form,
+  Input,
+  Select,
+  Upload,
+  Image,
+  UploadFile,
+  GetProp,
+  UploadProps,
+} from 'antd';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+const { Option } = Select;
+
+type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
+
+const getBase64 = (file: FileType): Promise<string> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => resolve(reader.result as string);
+    reader.onerror = (error) => reject(error);
+  });
+
+export default function UserCreate() {
+  const { t } = useTranslation();
+  const [previewOpen, setPreviewOpen] = useState(false);
+  const [previewImage, setPreviewImage] = useState('');
+
+  const [fileList, setFileList] = useState<UploadFile[]>([]);
+
+  const handlePreview = async (file: UploadFile) => {
+    if (!file.url && !file.preview) {
+      file.preview = await getBase64(file.originFileObj as FileType);
+    }
+
+    setPreviewImage(file.url || (file.preview as string));
+    setPreviewOpen(true);
+  };
+
+  const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) =>
+    setFileList(newFileList);
+
+  const customUploadButton = (
+    <div>
+      <div
+        style={{
+          height: '102px',
+          width: '102px',
+          backgroundColor: '#E2E2E2',
+          borderRadius: '50%',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          marginBottom: 8,
+          marginTop: 30,
+          cursor: 'pointer',
+        }}
+      >
+        <img
+          src="./icons/drawer/add_photo_alternate.svg"
+          alt="add_photo_alternate"
+          style={{ height: '18px', width: '18px' }}
+        />
+      </div>
+
+      <span style={{ fontSize: '14px', color: '#8c8c8c' }}>
+        {t('selectPhoto')}
+      </span>
+    </div>
+  );
+
+  const photoToUpload = (
+    <div style={{ height: '102px' }}>
+      <Upload
+        listType="picture-circle"
+        fileList={fileList}
+        onPreview={handlePreview}
+        onChange={handleChange}
+        beforeUpload={() => false}
+      >
+        {fileList.length > 0 ? null : customUploadButton}
+      </Upload>
+      {previewImage && (
+        <Image
+          wrapperStyle={{ display: 'none' }}
+          preview={{
+            visible: previewOpen,
+            onVisibleChange: (visible) => setPreviewOpen(visible),
+            afterOpenChange: (visible) => !visible && setPreviewImage(''),
+          }}
+          src={previewImage}
+        />
+      )}
+    </div>
+  );
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        height: '100%',
+      }}
+    >
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          marginBottom: '36px',
+        }}
+      >
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+          }}
+        >
+          {photoToUpload}
+        </div>
+      </div>
+      <Form
+        name="user-edit-form"
+        layout="vertical"
+        // onFinish={onFinish}
+        initialValues={{
+          name: '',
+          login: '',
+          password: '',
+          email: '',
+          tenant: '',
+          role: '',
+          status: '',
+        }}
+        style={{ flex: 1, display: 'flex', flexDirection: 'column' }}
+      >
+        <Form.Item
+          label={t('name')}
+          name="name"
+          rules={[{ required: true, message: t('nameMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('login')}
+          name="login"
+          rules={[{ required: true, message: t('loginMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('password')}
+          name="password"
+          rules={[{ required: true, message: t('passwordMessage') }]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item
+          label={t('email')}
+          name="email"
+          rules={[
+            { required: true, message: t('emailMessage') },
+            { type: 'email', message: t('emailErrorMessage') },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('tenant')}
+          name="tenant"
+          rules={[{ required: true, message: t('tenantMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('role')}
+          name="role"
+          rules={[{ required: true, message: t('roleMessage') }]}
+        >
+          <Select placeholder={t('roleMessage')}>
+            <Option value="Директор магазина">Директор магазина</Option>
+            <Option value="Менеджер">Менеджер</Option>
+            <Option value="Кассир">Кассир</Option>
+          </Select>
+        </Form.Item>
+
+        <Form.Item
+          label={t('status')}
+          name="status"
+          rules={[{ required: true, message: t('statusMessage') }]}
+        >
+          <Select placeholder={t('statusMessage')}>
+            <Option value="ACTIVE">Активен</Option>
+            <Option value="DISABLED">Неактивен</Option>
+            <Option value="BLOCKED">Заблокирован</Option>
+            <Option value="DELETED">Удален</Option>
+          </Select>
+        </Form.Item>
+
+        <div style={{ flexGrow: 1 }} />
+
+        <Form.Item>
+          <Button
+            type="primary"
+            htmlType="submit"
+            block
+            style={{ color: '#000' }}
+          >
+            <img
+              src="/icons/drawer/reg.svg"
+              alt="save"
+              style={{ height: '18px', width: '18px' }}
+            />{' '}
+            {t('addAccount')}
+          </Button>
+        </Form.Item>
+      </Form>
+    </div>
+  );
+}

client/src/components/UserEdit.tsx

@@ -0,0 +1,113 @@
+import { Button, Form, Input, Select } from 'antd';
+import { useTranslation } from 'react-i18next';
+
+const { Option } = Select;
+
+export default function UserEdit() {
+  const { t } = useTranslation();
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      <Form
+        name="user-edit-form"
+        layout="vertical"
+        // onFinish={onFinish}
+        initialValues={{
+          name: 'Александр Александров',
+          login: 'alexandralex@vorkout.ru',
+          password: 'jKUUl776GHd',
+          email: 'alexandralex@vorkout.ru',
+          tenant: 'text',
+          role: 'Директор магазина',
+          status: 'Активен',
+        }}
+        style={{ flex: 1, display: 'flex', flexDirection: 'column' }}
+      >
+        <Form.Item
+          label={t('name')}
+          name="name"
+          rules={[{ required: true, message: t('nameMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('login')}
+          name="login"
+          rules={[{ required: true, message: t('loginMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('password')}
+          name="password"
+          rules={[{ required: true, message: t('passwordMessage') }]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item
+          label={t('email')}
+          name="email"
+          rules={[
+            { required: true, message: t('emailMessage') },
+            { type: 'email', message: t('emailErrorMessage') },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('tenant')}
+          name="tenant"
+          rules={[{ required: true, message: t('tenantMessage') }]}
+        >
+          <Input />
+        </Form.Item>
+
+        <Form.Item
+          label={t('role')}
+          name="role"
+          rules={[{ required: true, message: t('roleMessage') }]}
+        >
+          <Select placeholder={t('roleMessage')}>
+            <Option value="Директор магазина">Директор магазина</Option>
+            <Option value="Менеджер">Менеджер</Option>
+            <Option value="Кассир">Кассир</Option>
+          </Select>
+        </Form.Item>
+
+        <Form.Item
+          label={t('status')}
+          name="status"
+          rules={[{ required: true, message: t('statusMessage') }]}
+        >
+          <Select placeholder={t('statusMessage')}>
+            <Option value="ACTIVE">Активен</Option>
+            <Option value="DISABLED">Неактивен</Option>
+            <Option value="BLOCKED">Заблокирован</Option>
+            <Option value="DELETED">Удален</Option>
+          </Select>
+        </Form.Item>
+
+        <div style={{ flexGrow: 1 }} />
+
+        <Form.Item>
+          <Button
+            type="primary"
+            htmlType="submit"
+            block
+            style={{ color: '#000' }}
+          >
+            <img
+              src="/icons/drawer/save.svg"
+              alt="save"
+              style={{ height: '18px', width: '18px' }}
+            />{' '}
+            {t('save')}
+          </Button>
+        </Form.Item>
+      </Form>
+    </div>
+  );
+}

client/src/config/AppWrapper.tsx

@@ -0,0 +1,24 @@
+import './i18n';
+import { ConfigProvider } from 'antd';
+import { useTranslation } from 'react-i18next';
+
+import { theme } from './customTheme';
+
+import en from 'antd/locale/en_US';
+import ru from 'antd/locale/ru_RU';
+
+const antdLocales = {
+  en: en,
+  ru: ru,
+};
+
+export default function AppWrapper({ children }: any) {
+  const { i18n } = useTranslation();
+  const currentLang = i18n.language.split('-')[0] as 'en' | 'ru';
+
+  return (
+    <ConfigProvider locale={antdLocales[currentLang]} theme={theme}>
+      {children}
+    </ConfigProvider>
+  );
+}

client/src/config/customTheme.ts

@@ -0,0 +1,15 @@
+export const theme = {
+  token: {
+    fontFamily: 'Roboto, sans-serif',
+    colorPrimary: '#C2DA3D',
+    Menu: {
+      itemColor: 'f2f2f2',
+      itemBg: '#f2f2f2',
+      subMenuItemBg: '#f2f2f2',
+      iconSize: '18px',
+    },
+    Layout: {
+      bodyBg: '#f2f2f2',
+    },
+  },
+};

client/src/config/i18n.ts

@@ -0,0 +1,74 @@
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+
+i18n
+  .use(LanguageDetector)
+  .use(initReactI18next)
+  .init({
+    fallbackLng: 'en',
+    supportedLngs: ['en', 'ru'],
+    interpolation: { escapeValue: false },
+    resources: {
+      en: {
+        translation: {
+          accounts: 'Accounts',
+          processDiagrams: 'Process diagrams',
+          runningProcesses: 'Running processes',
+          settings: 'Settings',
+          eventsList: 'Events list',
+          configuration: 'Configuration',
+          selectPhoto: 'Select photo',
+          name: 'Name',
+          login: 'Login',
+          password: 'Password',
+          email: 'Email',
+          tenant: 'Tenant',
+          role: 'Role',
+          status: 'Status',
+          nameMessage: 'Enter name',
+          loginMessage: 'Enter login',
+          passwordMessage: 'Enter password',
+          emailMessage: 'Enter email',
+          emailErrorMessage: 'Incorrect email',
+          tenantMessage: 'Enter tenant',
+          roleMessage: 'Choose role',
+          statusMessage: 'Choose status',
+          addAccount: 'Add account',
+          save: 'Save changes',
+          newAccount: 'New account',
+        },
+      },
+      ru: {
+        translation: {
+          accounts: 'Учетные записи',
+          processDiagrams: 'Схемы процессов',
+          runningProcesses: 'Запущенные процессы',
+          settings: 'Настройки',
+          eventsList: 'Справочкин событий',
+          configuration: 'Конфигурация',
+          selectPhoto: 'Выбрать фото',
+          name: 'Имя',
+          login: 'Логин',
+          password: 'Пароль',
+          email: 'Имейл',
+          tenant: 'Привязка',
+          role: 'Роль',
+          status: 'Статус',
+          nameMessage: 'Введите имя',
+          loginMessage: 'Введите логин',
+          passwordMessage: 'Введите пароль',
+          emailMessage: 'Введите имейл',
+          emailErrorMessage: 'Некорректный имейл',
+          tenantMessage: 'Введите привязку',
+          roleMessage: 'Выберите роль',
+          statusMessage: 'Выберите статус',
+          addAccount: 'Добавить аккаунт',
+          save: 'Сохранить изменения',
+          newAccount: 'Новая учетная запись',
+        },
+      },
+    },
+  });
+
+export default i18n;

client/src/index.css

@@ -11,3 +11,34 @@ code {
   font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
     monospace;
 }
+
+.ant-menu-inline .ant-menu-submenu-selected {
+  border: none;
+}
+
+.ant-menu-inline .ant-menu-submenu-selected > .ant-menu-submenu-title {
+  color: #548d10;
+}
+
+.ant-menu-inline .ant-menu-item-selected {
+  background-color: transparent;
+  border: none;
+  color: #548d10;
+}
+
+.ant-menu-item-selected {
+  background-color: transparent !important;
+}
+
+.ant-menu-item-selected a,
+.ant-menu-item-selected {
+  color: #548d10 !important;
+}
+
+.sider {
+  background-color: #f2f2f2;
+}
+
+.no-expand-icon .ant-menu-submenu-arrow {
+  display: none !important;
+}

client/src/index.tsx

@@ -2,8 +2,17 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
+import { BrowserRouter } from 'react-router-dom';
+import AppWrapper from './config/AppWrapper';
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement
 );
-root.render(<App />);
+
+root.render(
+  <AppWrapper>
+    <BrowserRouter>
+      <App />
+    </BrowserRouter>
+  </AppWrapper>
+);

client/src/pages/AccountsPage.tsx

@@ -0,0 +1,37 @@
+import Header from '../components/Header';
+import { useState } from 'react';
+import ContentDrawer from '../components/ContentDrawer';
+import UserCreate from '../components/UserCreate';
+import { useTranslation } from 'react-i18next';
+
+export default function AccountsPage() {
+  const { t } = useTranslation();
+  const [open, setOpen] = useState(false);
+
+  const showDrawer = () => setOpen(true);
+  const closeDrawer = () => setOpen(false);
+
+  return (
+    <>
+      <Header
+        title={t('accounts')}
+        additionalContent={
+          <img
+            src="./icons/header/add_2.svg"
+            alt="add"
+            style={{
+              height: '18px',
+              width: '18px',
+              cursor: 'pointer',
+            }}
+            onClick={showDrawer}
+          />
+        }
+      />
+
+      <ContentDrawer open={open} closeDrawer={closeDrawer} type="create">
+        <UserCreate />
+      </ContentDrawer>
+    </>
+  );
+}

client/src/pages/ConfigurationPage.tsx

@@ -0,0 +1,11 @@
+import { useTranslation } from 'react-i18next';
+import Header from '../components/Header';
+
+export default function ConfigurationPage() {
+  const { t } = useTranslation();
+  return (
+    <>
+      <Header title={t('configuration')} />
+    </>
+  );
+}

client/src/pages/EventsListPage.tsx

@@ -0,0 +1,11 @@
+import { useTranslation } from 'react-i18next';
+import Header from '../components/Header';
+
+export default function EventsListPage() {
+  const { t } = useTranslation();
+  return (
+    <>
+      <Header title={t('eventsList')} />
+    </>
+  );
+}

client/src/pages/MainLayout.tsx

@@ -0,0 +1,87 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import React, { useEffect, useState } from 'react';
+import { Layout } from 'antd';
+import Sider from 'antd/es/layout/Sider';
+import SiderMenu from '../components/SiderMenu';
+import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
+import ProcessDiagramPage from './ProcessDiagramPage';
+import RunningProcessesPage from './RunningProcessesPage';
+import AccountsPage from './AccountsPage';
+import EventsListPage from './EventsListPage';
+import ConfigurationPage from './ConfigurationPage';
+
+export default function MainLayout() {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const [collapsed, setCollapsed] = useState(false);
+  const [selectedKey, setSelectedKey] = useState('1');
+
+  const [width, setWidth] = useState<number | string>('15%');
+  const [collapsedWidth, setCollapsedWidth] = useState(50);
+
+  const calculateWidths = () => {
+    const windowWidth = window.innerWidth;
+    const expanded = Math.min(Math.max(windowWidth * 0.15, 180), 240);
+    const collapsed = Math.max(windowWidth * 0.038, 50);
+    setWidth(expanded);
+    setCollapsedWidth(collapsed);
+  };
+
+  useEffect(() => {
+    calculateWidths();
+    window.addEventListener('resize', calculateWidths);
+    return () => window.removeEventListener('resize', calculateWidths);
+  }, []);
+
+  useEffect(() => {
+    if (location.pathname === '/') {
+      navigate('/process-diagram');
+    }
+    setSelectedKey(location.pathname);
+  }, [location.pathname]);
+
+  function hangleMenuClick(e: any) {
+    const key = e.key;
+    if (key === 'toggle') {
+      setCollapsed(!collapsed);
+      return;
+    }
+    if (key === 'divider') {
+      return;
+    }
+
+    setSelectedKey(key);
+    navigate(key);
+  }
+
+  return (
+    <Layout style={{ minHeight: '100vh' }}>
+      <Sider
+        className="sider"
+        collapsible
+        collapsed={collapsed}
+        onCollapse={(value) => setCollapsed(value)}
+        theme="light"
+        width={width}
+        collapsedWidth={collapsedWidth}
+        trigger={null}
+      >
+        <SiderMenu
+          collapsed={collapsed}
+          selectedKey={selectedKey}
+          hangleMenuClick={hangleMenuClick}
+        />
+      </Sider>
+      <Layout>
+        <Routes>
+          <Route path="/process-diagram" element={<ProcessDiagramPage />} />
+          <Route path="/running-processes" element={<RunningProcessesPage />} />
+          <Route path="/accounts" element={<AccountsPage />} />
+          <Route path="/events-list" element={<EventsListPage />} />
+          <Route path="/configuration" element={<ConfigurationPage />} />
+          <Route path="*" element={<div>404 Not Found</div>} />
+        </Routes>
+      </Layout>
+    </Layout>
+  );
+}

client/src/pages/ProcessDiagramPage.tsx

@@ -0,0 +1,11 @@
+import { useTranslation } from 'react-i18next';
+import Header from '../components/Header';
+
+export default function ProcessDiagramPage() {
+  const { t } = useTranslation();
+  return (
+    <>
+      <Header title={t('processDiagrams')} />
+    </>
+  );
+}

client/src/pages/ProtectedRoute.tsx

@@ -0,0 +1,8 @@
+// ProtectedRoute.js
+import { Outlet } from 'react-router-dom';
+import React from 'react';
+
+const ProtectedRoute = (): React.JSX.Element => {
+  return <Outlet />;
+};
+export default ProtectedRoute;

client/src/pages/RunningProcessesPage.tsx

@@ -0,0 +1,11 @@
+import { useTranslation } from 'react-i18next';
+import Header from '../components/Header';
+
+export default function RunningProcessesPage() {
+  const { t } = useTranslation();
+  return (
+    <>
+      <Header title={t('runningProcesses')} />
+    </>
+  );
+}