Compare commits
No commits in common. "master" and "VORKOUT-3" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,8 +1,6 @@
|
||||
venv/
|
||||
node_modules/
|
||||
|
||||
init.lock
|
||||
|
||||
.idea/
|
||||
.vscode/
|
||||
*.swp
|
||||
|
||||
22
Makefile
22
Makefile
@ -36,25 +36,3 @@ revision:
|
||||
source .venv/bin/activate && \
|
||||
cd $(API_APPLICATION_NAME)/db && \
|
||||
PYTHONPATH='../..' ALEMBIC_MIGRATIONS=True alembic revision --autogenerate
|
||||
|
||||
venv-api:
|
||||
cd api && \
|
||||
poetry env activate \
|
||||
poetry install
|
||||
|
||||
install:
|
||||
make migrate head && \
|
||||
cd api && \
|
||||
poetry run python3 -m api.utils.init
|
||||
|
||||
%::
|
||||
echo $(MESSAGE)
|
||||
|
||||
format-api:
|
||||
cd api && \
|
||||
poetry run ruff format .
|
||||
|
||||
|
||||
check-api:
|
||||
cd api && \
|
||||
poetry run ruff format . --check
|
||||
|
||||
@ -9,10 +9,9 @@ from uvicorn import run
|
||||
from api.config import get_settings, DefaultSettings
|
||||
from api.endpoints import list_of_routes
|
||||
from api.utils.common import get_hostname
|
||||
from api.services.middleware import MiddlewareAccessTokenValidadtion
|
||||
|
||||
logger = logging.getLogger()
|
||||
logger.setLevel(logging.DEBUG)
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
|
||||
def bind_routes(application: FastAPI, setting: DefaultSettings) -> None:
|
||||
@ -33,7 +32,7 @@ def get_app() -> FastAPI:
|
||||
description=description,
|
||||
docs_url="/swagger",
|
||||
openapi_url="/openapi",
|
||||
version="0.0.2",
|
||||
version="0.1.0",
|
||||
)
|
||||
settings = get_settings()
|
||||
bind_routes(application, settings)
|
||||
@ -45,7 +44,6 @@ app = get_app()
|
||||
|
||||
dev_origins = [
|
||||
"http://localhost:3000",
|
||||
"http://127.0.0.1:64775",
|
||||
]
|
||||
|
||||
prod_origins = [""]
|
||||
@ -80,5 +78,3 @@ app.add_middleware(
|
||||
allow_methods=["GET", "POST", "OPTIONS", "DELETE", "PUT"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
app.add_middleware(MiddlewareAccessTokenValidadtion)
|
||||
|
||||
@ -44,12 +44,6 @@ 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))
|
||||
|
||||
REFRESH_TOKEN_EXPIRE_DAYS: int = int(environ.get("REFRESH_TOKEN_EXPIRE_DAYS_LONG", 365))
|
||||
|
||||
@cached_property
|
||||
def database_settings(self) -> dict:
|
||||
"""Get all settings for connection with database."""
|
||||
|
||||
@ -1,138 +0,0 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: f1b06efacec0
|
||||
Revises:
|
||||
Create Date: 2025-04-23 15:09:14.833213
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import mysql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = 'f1b06efacec0'
|
||||
down_revision: Union[str, None] = None
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('account',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('name', sa.String(length=100), nullable=False),
|
||||
sa.Column('login', sa.String(length=100), nullable=False),
|
||||
sa.Column('email', sa.String(length=100), nullable=True),
|
||||
sa.Column('bind_tenant_id', sa.String(length=40), nullable=True),
|
||||
sa.Column('role', sa.Enum('OWNER', 'ADMIN', 'EDITOR', 'VIEWER', name='accountrole'), nullable=False),
|
||||
sa.Column('meta', sa.JSON(), nullable=True),
|
||||
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=True),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'BLOCKED', 'DELETED', name='accountstatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index('idx_login', 'account', ['login'], unique=False)
|
||||
op.create_index('idx_name', 'account', ['name'], unique=False)
|
||||
op.create_table('account_keyring',
|
||||
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('key_type', sa.Enum('PASSWORD', 'ACCESS_TOKEN', 'REFRESH_TOKEN', 'API_KEY', name='keytype'), nullable=False),
|
||||
sa.Column('key_id', sa.String(length=40), nullable=False),
|
||||
sa.Column('key_value', sa.String(length=255), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('expiry', sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'EXPIRED', 'DELETED', name='keystatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
|
||||
sa.PrimaryKeyConstraint('owner_id', 'key_type', 'key_id')
|
||||
)
|
||||
op.create_table('list_events',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('name', sa.String(length=40, collation='latin1_bin'), nullable=False),
|
||||
sa.Column('title', sa.String(length=64), nullable=False),
|
||||
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('schema', sa.JSON(), nullable=True),
|
||||
sa.Column('state', sa.Enum('AUTO', 'DESCRIPTED', name='eventstate'), nullable=False),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'DELETED', name='eventstatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
|
||||
sa.PrimaryKeyConstraint('id'),
|
||||
sa.UniqueConstraint('name')
|
||||
)
|
||||
op.create_table('process_schema',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('title', sa.String(length=100), nullable=False),
|
||||
sa.Column('description', sa.Text(), nullable=False),
|
||||
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('settings', sa.JSON(), nullable=True),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'STOPPING', 'STOPPED', 'DELETED', name='processstatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
|
||||
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index('idx_owner_id', 'process_schema', ['owner_id'], unique=False)
|
||||
op.create_table('process_version_archive',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('ps_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('version', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('snapshot', sa.JSON(), nullable=True),
|
||||
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('is_last', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=True),
|
||||
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
|
||||
sa.ForeignKeyConstraint(['ps_id'], ['process_schema.id'], ),
|
||||
sa.PrimaryKeyConstraint('id', 'version')
|
||||
)
|
||||
op.create_table('ps_node',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('ps_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('node_type', sa.Enum('TYPE1', 'TYPE2', 'TYPE3', name='nodetype'), nullable=False),
|
||||
sa.Column('settings', sa.JSON(), nullable=True),
|
||||
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'DELETED', name='nodestatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
|
||||
sa.ForeignKeyConstraint(['ps_id'], ['process_schema.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index('idx_ps_id', 'ps_node', ['ps_id'], unique=False)
|
||||
op.create_table('node_link',
|
||||
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
|
||||
sa.Column('link_name', sa.String(length=20), nullable=False),
|
||||
sa.Column('node_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('next_node_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('settings', sa.JSON(), nullable=True),
|
||||
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
|
||||
sa.Column('status', sa.Enum('ACTIVE', 'STOPPING', 'STOPPED', 'DELETED', name='nodelinkstatus'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
|
||||
sa.ForeignKeyConstraint(['next_node_id'], ['ps_node.id'], ),
|
||||
sa.ForeignKeyConstraint(['node_id'], ['ps_node.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index('idx_next_node_id', 'node_link', ['next_node_id'], unique=False)
|
||||
op.create_index('idx_node_id', 'node_link', ['node_id'], unique=False)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Downgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_index('idx_node_id', table_name='node_link')
|
||||
op.drop_index('idx_next_node_id', table_name='node_link')
|
||||
op.drop_table('node_link')
|
||||
op.drop_index('idx_ps_id', table_name='ps_node')
|
||||
op.drop_table('ps_node')
|
||||
op.drop_table('process_version_archive')
|
||||
op.drop_index('idx_owner_id', table_name='process_schema')
|
||||
op.drop_table('process_schema')
|
||||
op.drop_table('list_events')
|
||||
op.drop_table('account_keyring')
|
||||
op.drop_index('idx_name', table_name='account')
|
||||
op.drop_index('idx_login', table_name='account')
|
||||
op.drop_table('account')
|
||||
# ### end Alembic commands ###
|
||||
@ -8,16 +8,18 @@ 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)
|
||||
@ -42,11 +44,9 @@ 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,7 +58,6 @@ 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
|
||||
|
||||
@ -1,130 +0,0 @@
|
||||
from typing import Optional
|
||||
import math
|
||||
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from sqlalchemy import insert, select, func
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
from enum import Enum
|
||||
|
||||
from api.db.tables.account import account_table
|
||||
|
||||
from api.schemas.account.account import User
|
||||
from api.schemas.endpoints.account import AllUserResponse, all_user_adapter
|
||||
|
||||
|
||||
async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Optional[User]:
|
||||
"""
|
||||
Получает список ползовелей заданных значениями page, limit.
|
||||
"""
|
||||
|
||||
first_user = page * limit - (limit)
|
||||
|
||||
query = (
|
||||
select(
|
||||
account_table.c.id,
|
||||
account_table.c.name,
|
||||
account_table.c.login,
|
||||
account_table.c.email,
|
||||
account_table.c.bind_tenant_id,
|
||||
account_table.c.role,
|
||||
account_table.c.created_at,
|
||||
account_table.c.status,
|
||||
)
|
||||
.order_by(account_table.c.id)
|
||||
.offset(first_user)
|
||||
.limit(limit)
|
||||
)
|
||||
|
||||
count_query = select(func.count()).select_from(account_table)
|
||||
|
||||
result = await connection.execute(query)
|
||||
count_result = await connection.execute(count_query)
|
||||
|
||||
users_data = result.mappings().all()
|
||||
total_count = count_result.scalar()
|
||||
total_pages = math.ceil(total_count / limit)
|
||||
|
||||
validated_users = all_user_adapter.validate_python(users_data)
|
||||
|
||||
return AllUserResponse(users=validated_users, amount_count=total_count, amount_pages=total_pages)
|
||||
|
||||
|
||||
async def get_user_by_id(connection: AsyncConnection, id: int) -> Optional[User]:
|
||||
"""
|
||||
Получает юзера по 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()
|
||||
|
||||
if not user_db:
|
||||
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)
|
||||
)
|
||||
for column in account_table.columns
|
||||
}
|
||||
|
||||
return User.model_validate(user_data)
|
||||
|
||||
|
||||
async def get_user_by_login(connection: AsyncConnection, login: str) -> Optional[User]:
|
||||
"""
|
||||
Получает юзера по 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
|
||||
|
||||
user_data = {
|
||||
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
|
||||
}
|
||||
|
||||
return User.model_validate(user_data)
|
||||
|
||||
|
||||
async def update_user_by_id(connection: AsyncConnection, update_values, user) -> Optional[User]:
|
||||
"""
|
||||
Вносит изменеия в нужное поле таблицы account_table.
|
||||
"""
|
||||
await connection.execute(account_table.update().where(account_table.c.id == user.id).values(**update_values))
|
||||
|
||||
await connection.commit()
|
||||
|
||||
|
||||
async def create_user(connection: AsyncConnection, user: User, creator_id: int) -> Optional[User]:
|
||||
"""
|
||||
Создает нове поле в таблице account_table.
|
||||
"""
|
||||
query = insert(account_table).values(
|
||||
name=user.name,
|
||||
login=user.login,
|
||||
email=user.email,
|
||||
bind_tenant_id=user.bind_tenant_id,
|
||||
role=user.role.value,
|
||||
meta=user.meta,
|
||||
creator_id=creator_id,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
status=user.status.value,
|
||||
)
|
||||
|
||||
await connection.execute(query)
|
||||
|
||||
await connection.commit()
|
||||
|
||||
return user
|
||||
@ -1,87 +0,0 @@
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
from enum import Enum
|
||||
|
||||
from api.db.tables.account import account_table, account_keyring_table, KeyType, KeyStatus
|
||||
|
||||
from api.schemas.account.account import User
|
||||
from api.schemas.account.account_keyring import AccountKeyring
|
||||
|
||||
from api.utils.key_id_gen import KeyIdGenerator
|
||||
|
||||
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)
|
||||
)
|
||||
|
||||
user_db_cursor = await connection.execute(query)
|
||||
user_db = user_db_cursor.one_or_none()
|
||||
|
||||
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)
|
||||
)
|
||||
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)
|
||||
)
|
||||
for column in account_keyring_table.columns
|
||||
}
|
||||
|
||||
user = User.model_validate(user_data)
|
||||
password = AccountKeyring.model_validate(password_data)
|
||||
return user, password
|
||||
|
||||
|
||||
async def upgrade_old_refresh_token(connection: AsyncConnection, user, refresh_token) -> Optional[User]:
|
||||
new_status = KeyStatus.EXPIRED
|
||||
|
||||
update_query = (
|
||||
update(account_keyring_table)
|
||||
.where(
|
||||
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,
|
||||
)
|
||||
.values(status=new_status)
|
||||
)
|
||||
|
||||
await connection.execute(update_query)
|
||||
|
||||
await connection.commit()
|
||||
|
||||
|
||||
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,
|
||||
key_id=KeyIdGenerator(),
|
||||
key_value=new_refresh_token,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
expiry=new_refresh_token_expires_time,
|
||||
status=KeyStatus.ACTIVE,
|
||||
)
|
||||
|
||||
await connection.execute(new_refresh_token)
|
||||
|
||||
await connection.commit()
|
||||
@ -1,69 +0,0 @@
|
||||
from typing import Optional
|
||||
from datetime import datetime, timezone
|
||||
from enum import Enum
|
||||
|
||||
from sqlalchemy import insert, select
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.tables.account import account_keyring_table
|
||||
|
||||
from api.schemas.account.account_keyring import AccountKeyring
|
||||
|
||||
|
||||
async def get_key_by_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)
|
||||
|
||||
user_db_cursor = await connection.execute(query)
|
||||
user_db = user_db_cursor.one_or_none()
|
||||
|
||||
if not user_db:
|
||||
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)
|
||||
)
|
||||
for column in account_keyring_table.columns
|
||||
}
|
||||
|
||||
return AccountKeyring.model_validate(user_data)
|
||||
|
||||
|
||||
async def update_key_by_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]:
|
||||
"""
|
||||
Вносит изменеия в нужное поле таблицы account_keyring_table.
|
||||
"""
|
||||
await connection.execute(
|
||||
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]:
|
||||
"""
|
||||
Создает нове поле в таблице 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,
|
||||
)
|
||||
|
||||
key.created_at = datetime.now(timezone.utc)
|
||||
key.key_id = key_id
|
||||
|
||||
await connection.execute(query)
|
||||
|
||||
await connection.commit()
|
||||
|
||||
return key
|
||||
@ -1 +1 @@
|
||||
from . import account, events, process
|
||||
from . import account,events,process
|
||||
|
||||
@ -1,67 +1,73 @@
|
||||
import enum
|
||||
|
||||
from sqlalchemy import Table, Column, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
|
||||
from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
from enum import Enum
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from enum import Enum, auto
|
||||
|
||||
from api.db.sql_types import UnsignedInt
|
||||
|
||||
from api.db import metadata
|
||||
|
||||
|
||||
class AccountRole(enum.StrEnum):
|
||||
OWNER = "OWNER"
|
||||
ADMIN = "ADMIN"
|
||||
EDITOR = "EDITOR"
|
||||
VIEWER = "VIEWER"
|
||||
class AccountRole(str,Enum):
|
||||
OWNER = auto()
|
||||
ADMIN = auto()
|
||||
EDITOR = auto()
|
||||
VIEWER = auto()
|
||||
|
||||
class AccountStatus(str,Enum):
|
||||
ACTIVE = auto()
|
||||
DISABLED = auto()
|
||||
BLOCKED = auto()
|
||||
DELETED = auto()
|
||||
|
||||
class AccountStatus(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
DISABLED = "DISABLED"
|
||||
BLOCKED = "BLOCKED"
|
||||
DELETED = "DELETED"
|
||||
|
||||
|
||||
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):
|
||||
PASSWORD = auto()
|
||||
ACCESS_TOKEN = auto()
|
||||
REFRESH_TOKEN = auto()
|
||||
API_KEY = auto()
|
||||
|
||||
class KeyType(enum.StrEnum):
|
||||
PASSWORD = "PASSWORD"
|
||||
ACCESS_TOKEN = "ACCESS_TOKEN"
|
||||
REFRESH_TOKEN = "REFRESH_TOKEN"
|
||||
API_KEY = "API_KEY"
|
||||
|
||||
|
||||
class KeyStatus(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
EXPIRED = "EXPIRED"
|
||||
DELETED = "DELETED"
|
||||
|
||||
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), default=None),
|
||||
Column('key_value', String(64), 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), )
|
||||
|
||||
|
||||
def set_expiry_for_key_type(key_type: KeyType) -> datetime:
|
||||
match key_type:
|
||||
case KeyType.ACCESS_TOKEN:
|
||||
return datetime.now() + timedelta(hours=1) # 1 hour
|
||||
case KeyType.REFRESH_TOKEN:
|
||||
return datetime.now() + timedelta(days=365) # 1 year
|
||||
case KeyType.API_KEY:
|
||||
return datetime.max # max datetime
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
import enum
|
||||
|
||||
from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
|
||||
from sqlalchemy.sql import func
|
||||
from enum import Enum, auto
|
||||
@ -8,27 +6,24 @@ from api.db.sql_types import UnsignedInt
|
||||
|
||||
from api.db import metadata
|
||||
|
||||
class EventState(str, Enum):
|
||||
AUTO = auto()
|
||||
DESCRIPTED = auto()
|
||||
|
||||
class EventState(enum.StrEnum):
|
||||
AUTO = "AUTO"
|
||||
DESCRIPTED = "DESCRIPTED"
|
||||
|
||||
|
||||
class EventStatus(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
DISABLED = "DISABLED"
|
||||
DELETED = "DELETED"
|
||||
class EventStatus(str, Enum):
|
||||
ACTIVE = auto()
|
||||
DISABLED = auto()
|
||||
DELETED = auto()
|
||||
|
||||
|
||||
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),
|
||||
)
|
||||
|
||||
@ -1,18 +1,4 @@
|
||||
import enum
|
||||
|
||||
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
|
||||
|
||||
@ -21,88 +7,78 @@ from api.db.sql_types import UnsignedInt
|
||||
from api.db import metadata
|
||||
|
||||
|
||||
class ProcessStatus(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
STOPPING = "STOPPING"
|
||||
STOPPED = "STOPPED"
|
||||
DELETED = "DELETED"
|
||||
|
||||
# Определение перечислений для статуса процесса
|
||||
class ProcessStatus(str, Enum):
|
||||
ACTIVE = auto()
|
||||
STOPPING = auto()
|
||||
STOPPED = auto()
|
||||
DELETED = auto()
|
||||
|
||||
# Определение таблицы process_schema
|
||||
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"),
|
||||
)
|
||||
|
||||
|
||||
class NodeStatus(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
DISABLED = "DISABLED"
|
||||
DELETED = "DELETED"
|
||||
'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(enum.StrEnum):
|
||||
ACTIVE = "ACTIVE"
|
||||
STOPPING = "STOPPING"
|
||||
STOPPED = "STOPPED"
|
||||
DELETED = "DELETED"
|
||||
|
||||
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', 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'))
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
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 = []
|
||||
|
||||
__all__ = [
|
||||
"list_of_routes",
|
||||
|
||||
@ -1,135 +0,0 @@
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
Depends,
|
||||
HTTPException,
|
||||
status,
|
||||
)
|
||||
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.connection.session import get_connection_dep
|
||||
|
||||
from api.db.logic.account import (
|
||||
get_user_by_id,
|
||||
update_user_by_id,
|
||||
create_user,
|
||||
get_user_by_login,
|
||||
get_user_accaunt_page,
|
||||
)
|
||||
|
||||
from api.schemas.account.account import User
|
||||
from api.db.tables.account import AccountStatus
|
||||
from api.schemas.base import bearer_schema
|
||||
from api.schemas.endpoints.account import UserUpdate, AllUserResponse
|
||||
from api.services.auth import get_current_user
|
||||
|
||||
from api.services.user_role_validation import db_user_role_validation
|
||||
from api.services.update_data_validation import update_user_data_changes
|
||||
|
||||
|
||||
api_router = APIRouter(
|
||||
prefix="/account",
|
||||
tags=["User accountModel"],
|
||||
)
|
||||
|
||||
|
||||
@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=AllUserResponse)
|
||||
async def get_all_account(
|
||||
page: int = 1,
|
||||
limit: int = 10,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user_list = await get_user_accaunt_page(connection, page, limit)
|
||||
|
||||
if user_list is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Accounts not found")
|
||||
|
||||
return user_list
|
||||
|
||||
|
||||
@api_router.get("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def get_account(
|
||||
user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@api_router.post("", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def create_account(
|
||||
user: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user_validation = await get_user_by_login(connection, user.login)
|
||||
|
||||
if user_validation is None:
|
||||
await create_user(connection, user, authorize_user.id)
|
||||
user_new = await get_user_by_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."
|
||||
)
|
||||
|
||||
|
||||
@api_router.put("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def update_account(
|
||||
user_id: int,
|
||||
user_update: UserUpdate,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
update_values = update_user_data_changes(user_update, user)
|
||||
|
||||
if update_values is None:
|
||||
return user
|
||||
|
||||
user_update_data = User.model_validate({**user.model_dump(), **update_values})
|
||||
|
||||
await update_user_by_id(connection, update_values, user)
|
||||
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@api_router.delete("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def delete_account(
|
||||
user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
user_update = UserUpdate(status=AccountStatus.DELETED.value)
|
||||
|
||||
update_values = update_user_data_changes(user_update, user)
|
||||
|
||||
if update_values is None:
|
||||
return user
|
||||
|
||||
await update_user_by_id(connection, update_values, user)
|
||||
|
||||
user = await get_user_by_id(connection, user_id)
|
||||
|
||||
return user
|
||||
@ -1,115 +0,0 @@
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
Depends,
|
||||
HTTPException,
|
||||
Request,
|
||||
Response,
|
||||
status,
|
||||
)
|
||||
|
||||
from loguru import logger
|
||||
from fastapi_jwt_auth import AuthJWT
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
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.schemas.endpoints.auth import Auth, Access
|
||||
|
||||
api_router = APIRouter(
|
||||
prefix="/auth",
|
||||
tags=["User auth"],
|
||||
)
|
||||
|
||||
|
||||
class Settings(BaseModel):
|
||||
authjwt_secret_key: str = get_settings().SECRET_KEY
|
||||
# Configure application to store and get JWT from cookies
|
||||
authjwt_token_location: set = {"headers", "cookies"}
|
||||
authjwt_cookie_domain: str = get_settings().DOMAIN
|
||||
|
||||
# Only allow JWT cookies to be sent over https
|
||||
authjwt_cookie_secure: bool = get_settings().ENV == "prod"
|
||||
# Enable csrf double submit protection. default is True
|
||||
authjwt_cookie_csrf_protect: bool = False
|
||||
authjwt_cookie_samesite: str = "lax"
|
||||
|
||||
|
||||
@AuthJWT.load_config
|
||||
def get_config():
|
||||
return Settings()
|
||||
|
||||
|
||||
@api_router.post("", response_model=Access)
|
||||
async def login_for_access_token(
|
||||
user: Auth,
|
||||
response: Response,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
Authorize: AuthJWT = Depends(),
|
||||
):
|
||||
"""Авторизирует, выставляет токены в куки."""
|
||||
|
||||
user = await authenticate_user(connection, user.login, user.password)
|
||||
|
||||
# print("login_for_access_token", user)
|
||||
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Incorrect username or password",
|
||||
# headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
|
||||
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)
|
||||
|
||||
refresh_token_expires_time = datetime.now(timezone.utc) + refresh_token_expires
|
||||
|
||||
await add_new_refresh_token(connection, refresh_token, refresh_token_expires_time, user)
|
||||
|
||||
Authorize.set_refresh_cookies(refresh_token)
|
||||
|
||||
return Access(access_token=access_token)
|
||||
|
||||
|
||||
@api_router.post("/refresh", response_model=Access)
|
||||
async def refresh(
|
||||
request: Request, connection: AsyncConnection = Depends(get_connection_dep), Authorize: AuthJWT = Depends()
|
||||
):
|
||||
refresh_token = request.cookies.get("refresh_token_cookie")
|
||||
# print("Refresh Token:", refresh_token)
|
||||
|
||||
if not refresh_token:
|
||||
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)
|
||||
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Invalid refresh token",
|
||||
)
|
||||
|
||||
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)
|
||||
|
||||
return Access(access_token=new_access_token)
|
||||
@ -1,128 +0,0 @@
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
Body,
|
||||
Depends,
|
||||
Form,
|
||||
HTTPException,
|
||||
Response,
|
||||
status,
|
||||
)
|
||||
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.connection.session import get_connection_dep
|
||||
|
||||
from api.db.logic.keyring import get_key_by_id, create_key, update_key_by_id
|
||||
|
||||
|
||||
from api.db.tables.account import KeyStatus
|
||||
from api.schemas.base import bearer_schema
|
||||
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
|
||||
|
||||
from api.schemas.account.account_keyring import AccountKeyring
|
||||
from api.services.auth import get_current_user
|
||||
|
||||
from api.services.user_role_validation import db_user_role_validation
|
||||
from api.services.update_data_validation import update_key_data_changes
|
||||
|
||||
|
||||
api_router = APIRouter(
|
||||
prefix="/keyring",
|
||||
tags=["User KeyringModel"],
|
||||
)
|
||||
|
||||
|
||||
@api_router.get("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
|
||||
async def get_keyring(
|
||||
key_id: str, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
|
||||
if keyring is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Key not found")
|
||||
|
||||
return keyring
|
||||
|
||||
|
||||
@api_router.post("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
|
||||
async def create_keyring(
|
||||
user_id: int,
|
||||
key_id: str,
|
||||
key: AccountKeyringUpdate,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
|
||||
if keyring is None:
|
||||
keyring_new = await create_key(
|
||||
connection,
|
||||
key,
|
||||
key_id,
|
||||
)
|
||||
return keyring_new
|
||||
|
||||
else:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST, detail="An keyring with this information already exists."
|
||||
)
|
||||
|
||||
|
||||
@api_router.put("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
|
||||
async def update_keyring(
|
||||
user_id: int,
|
||||
key_id: str,
|
||||
keyring_update: AccountKeyringUpdate,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
if keyring is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
|
||||
|
||||
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_by_id(connection, update_values, keyring)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
|
||||
return keyring
|
||||
|
||||
|
||||
@api_router.delete("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
|
||||
async def delete_keyring(
|
||||
user_id: int,
|
||||
key_id: str,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
if keyring is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
|
||||
|
||||
keyring_update = AccountKeyringUpdate(status=KeyStatus.DELETED.value)
|
||||
|
||||
update_values = update_key_data_changes(keyring_update, keyring)
|
||||
|
||||
if update_values is None:
|
||||
return keyring
|
||||
|
||||
await update_key_by_id(connection, update_values, keyring)
|
||||
|
||||
keyring = await get_key_by_id(connection, key_id)
|
||||
|
||||
return keyring
|
||||
@ -1,65 +0,0 @@
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
Body,
|
||||
Depends,
|
||||
Form,
|
||||
HTTPException,
|
||||
Request,
|
||||
Response,
|
||||
status,
|
||||
)
|
||||
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.connection.session import get_connection_dep
|
||||
from api.db.logic.account import get_user_by_id, update_user_by_id, get_user_by_login
|
||||
from api.schemas.base import bearer_schema
|
||||
from api.services.auth import get_current_user
|
||||
from api.services.update_data_validation import update_user_data_changes
|
||||
|
||||
from api.schemas.endpoints.account import UserUpdate
|
||||
from api.schemas.account.account import User
|
||||
|
||||
|
||||
api_router = APIRouter(
|
||||
prefix="/profile",
|
||||
tags=["User accountModel"],
|
||||
)
|
||||
|
||||
|
||||
@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def get_profile(
|
||||
connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
|
||||
):
|
||||
user = await get_user_by_login(connection, current_user)
|
||||
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@api_router.put("", dependencies=[Depends(bearer_schema)], response_model=User)
|
||||
async def update_profile(
|
||||
user_updata: UserUpdate,
|
||||
connection: AsyncConnection = Depends(get_connection_dep),
|
||||
current_user=Depends(get_current_user),
|
||||
):
|
||||
user = await get_user_by_login(connection, current_user)
|
||||
if user is None:
|
||||
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)
|
||||
|
||||
if update_values is None:
|
||||
return user
|
||||
|
||||
await update_user_by_id(connection, update_values, user)
|
||||
|
||||
user = await get_user_by_id(connection, user.id)
|
||||
|
||||
return user
|
||||
else:
|
||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="Bad body")
|
||||
@ -1,20 +1,30 @@
|
||||
import datetime
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
from pydantic import EmailStr, Field
|
||||
from api.db.tables.account import AccountRole, AccountStatus
|
||||
from enum import Enum
|
||||
|
||||
from api.schemas.base import Base
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
|
||||
|
||||
class User(Base):
|
||||
id: Optional[int] = None
|
||||
class Role(Enum):
|
||||
OWNER = "Owner"
|
||||
ADMIN = "Admin"
|
||||
EDITOR = "Editor"
|
||||
VIEWER = "Viewer"
|
||||
|
||||
class Status(Enum):
|
||||
ACTIVE = "Active"
|
||||
DISABLED = "Disabled"
|
||||
BLOCKED = "Blocked"
|
||||
DELETED = "Deleted"
|
||||
|
||||
class User(BaseModel):
|
||||
id: int
|
||||
name: str = Field(..., max_length=100)
|
||||
login: str = Field(..., max_length=100)
|
||||
email: Optional[EmailStr] = Field(None, max_length=100) # Электронная почта (может быть None)
|
||||
bind_tenant_id: Optional[str] = Field(None, max_length=40)
|
||||
role: AccountRole
|
||||
email: EmailStr = Field(..., max_length=100)
|
||||
bind_tenant_id: str = Field(..., max_length=40)
|
||||
role: Role
|
||||
meta: dict
|
||||
creator_id: Optional[int] = None
|
||||
creator_id: int
|
||||
is_active: bool
|
||||
created_at: datetime
|
||||
status: AccountStatus
|
||||
status: Status
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
import datetime
|
||||
from typing import Optional
|
||||
from pydantic import Field
|
||||
|
||||
from enum import Enum
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
from datetime import datetime
|
||||
from api.db.tables.account import KeyType, KeyStatus
|
||||
|
||||
from api.schemas.base import Base
|
||||
|
||||
|
||||
class AccountKeyring(Base):
|
||||
class Type(Enum):
|
||||
PASSWORD = "password"
|
||||
ACCESS_TOKEN = "access_token"
|
||||
REFRESH_TOKEN = "refresh_token"
|
||||
API_KEY = "api_key"
|
||||
|
||||
class Status(Enum):
|
||||
ACTIVE = "Active"
|
||||
EXPIRED = "Expired"
|
||||
DELETED = "Deleted"
|
||||
|
||||
class AccountKeyring(BaseModel):
|
||||
owner_id: int
|
||||
key_type: KeyType
|
||||
key_id: Optional[str] = Field(None, max_length=40)
|
||||
key_value: str = Field(..., max_length=255)
|
||||
key_type: Type
|
||||
key_id: str = Field(..., max_length=40)
|
||||
key_value: str = Field(..., max_length=64)
|
||||
created_at: datetime
|
||||
expiry: Optional[datetime] = None
|
||||
status: KeyStatus
|
||||
expiry: datetime
|
||||
status: Status
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
from fastapi.security import HTTPBearer
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
from pydantic.alias_generators import to_camel
|
||||
|
||||
|
||||
bearer_schema = HTTPBearer() # схема для авторизации в swagger
|
||||
|
||||
|
||||
class Base(BaseModel):
|
||||
model_config = ConfigDict(
|
||||
from_attributes=True,
|
||||
alias_generator=to_camel,
|
||||
populate_by_name=True,
|
||||
)
|
||||
@ -1,40 +0,0 @@
|
||||
from typing import Optional, List
|
||||
from datetime import datetime
|
||||
from pydantic import EmailStr, Field, TypeAdapter
|
||||
|
||||
from api.db.tables.account import AccountRole, AccountStatus
|
||||
|
||||
from api.schemas.base import Base
|
||||
|
||||
|
||||
class UserUpdate(Base):
|
||||
id: Optional[int] = None
|
||||
name: Optional[str] = Field(None, max_length=100)
|
||||
login: Optional[str] = Field(None, max_length=100)
|
||||
email: Optional[EmailStr] = None
|
||||
bind_tenant_id: Optional[str] = Field(None, max_length=40)
|
||||
role: Optional[AccountRole] = None
|
||||
meta: Optional[dict] = None
|
||||
creator_id: Optional[int] = None
|
||||
created_at: Optional[datetime] = None
|
||||
status: Optional[AccountStatus] = None
|
||||
|
||||
|
||||
class AllUser(Base):
|
||||
id: int
|
||||
name: str
|
||||
login: str
|
||||
email: Optional[EmailStr] = None
|
||||
bind_tenant_id: Optional[str] = None
|
||||
role: AccountRole
|
||||
created_at: datetime
|
||||
status: AccountStatus
|
||||
|
||||
|
||||
class AllUserResponse(Base):
|
||||
users: List[AllUser]
|
||||
amount_count: int
|
||||
amount_pages: int
|
||||
|
||||
|
||||
all_user_adapter = TypeAdapter(List[AllUser])
|
||||
@ -1,17 +0,0 @@
|
||||
import datetime
|
||||
from typing import Optional
|
||||
from pydantic import Field
|
||||
from datetime import datetime
|
||||
from api.db.tables.account import KeyType, KeyStatus
|
||||
|
||||
from api.schemas.base import Base
|
||||
|
||||
|
||||
class AccountKeyringUpdate(Base):
|
||||
owner_id: Optional[int] = None
|
||||
key_type: Optional[KeyType] = None
|
||||
key_id: Optional[str] = Field(None, max_length=40)
|
||||
key_value: Optional[str] = Field(None, max_length=255)
|
||||
created_at: Optional[datetime] = None
|
||||
expiry: Optional[datetime] = None
|
||||
status: Optional[KeyStatus] = None
|
||||
@ -1,16 +0,0 @@
|
||||
from api.schemas.base import Base
|
||||
|
||||
# Таблица для получения информации из запроса
|
||||
|
||||
|
||||
class Auth(Base):
|
||||
login: str
|
||||
password: str
|
||||
|
||||
|
||||
class Refresh(Base):
|
||||
refresh_token: str
|
||||
|
||||
|
||||
class Access(Base):
|
||||
access_token: str
|
||||
@ -1,10 +1,8 @@
|
||||
from pydantic import Field
|
||||
from pydantic import BaseModel, 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"
|
||||
@ -16,8 +14,7 @@ class Status(Enum):
|
||||
DISABLED = "Disabled"
|
||||
DELETED = "Deleted"
|
||||
|
||||
|
||||
class ListEvent(Base):
|
||||
class ListEvent(BaseModel):
|
||||
id: int
|
||||
name: str = Field(..., max_length=40)
|
||||
title: str = Field(..., max_length=64)
|
||||
|
||||
@ -1,19 +1,15 @@
|
||||
from pydantic import Field
|
||||
from pydantic import BaseModel, 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(Base):
|
||||
class MyModel(BaseModel):
|
||||
id: int
|
||||
link_name: str = Field(..., max_length=20)
|
||||
node_id: int
|
||||
|
||||
@ -1,19 +1,15 @@
|
||||
from pydantic import Field
|
||||
from pydantic import BaseModel, 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(Base):
|
||||
class ProcessSchema(BaseModel):
|
||||
id: int
|
||||
title: str = Field(..., max_length=100)
|
||||
description: str
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
from pydantic import BaseModel, Field
|
||||
from typing import Dict, Any
|
||||
from datetime import datetime
|
||||
|
||||
from api.schemas.base import Base
|
||||
|
||||
|
||||
class ProcessStatusSchema(Base):
|
||||
class ProcessStatusSchema(BaseModel):
|
||||
id: int
|
||||
version: int
|
||||
snapshot: Dict[str, Any]
|
||||
|
||||
@ -1,21 +1,19 @@
|
||||
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
|
||||
|
||||
pass
|
||||
|
||||
class Status(Enum):
|
||||
ACTIVE = "Active"
|
||||
DISABLED = "Disabled"
|
||||
DELETED = "Deleted"
|
||||
|
||||
|
||||
class Ps_Node(Base):
|
||||
class Ps_Node(BaseModel):
|
||||
id: int
|
||||
ps_id: int
|
||||
node_type: NodeType
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
from fastapi import Request, HTTPException
|
||||
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
|
||||
from api.db.tables.account import AccountStatus
|
||||
|
||||
from api.utils.hasher import Hasher
|
||||
|
||||
|
||||
async def get_current_user(request: Request) -> Optional[User]:
|
||||
if not hasattr(request.state, "current_user"):
|
||||
return HTTPException(status_code=401, detail="Unauthorized")
|
||||
return request.state.current_user
|
||||
|
||||
|
||||
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 != AccountStatus.ACTIVE:
|
||||
return None
|
||||
hasher = Hasher()
|
||||
if not hasher.verify_data(password, sql_password.key_value):
|
||||
return None
|
||||
return sql_user
|
||||
@ -1,61 +0,0 @@
|
||||
from starlette.middleware.base import BaseHTTPMiddleware
|
||||
from fastapi import (
|
||||
Request,
|
||||
status,
|
||||
)
|
||||
|
||||
from fastapi.responses import JSONResponse
|
||||
from api.config import get_settings
|
||||
|
||||
import re
|
||||
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/?$"),
|
||||
]
|
||||
|
||||
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"},
|
||||
)
|
||||
|
||||
token = auth_header.split(" ")[1]
|
||||
Authorize = AuthJWT(request)
|
||||
|
||||
try:
|
||||
current_user = Authorize.get_jwt_subject()
|
||||
request.state.current_user = current_user
|
||||
return await call_next(request)
|
||||
|
||||
except Exception:
|
||||
return JSONResponse(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
content={"detail": "The access token is invalid or expired."},
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
# async with get_connection() as connection:
|
||||
# authorize_user = await get_user_login(connection, current_user)
|
||||
# print(authorize_user)
|
||||
# if authorize_user is None :
|
||||
# return JSONResponse(
|
||||
# status_code=status.HTTP_404_NOT_FOUND ,
|
||||
# detail="User not found.")
|
||||
@ -1,74 +0,0 @@
|
||||
from enum import Enum
|
||||
from typing import Optional
|
||||
from api.schemas.endpoints.account import UserUpdate
|
||||
from api.db.tables.account import KeyType, KeyStatus
|
||||
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
|
||||
from api.db.tables.account import AccountRole, AccountStatus
|
||||
|
||||
|
||||
def update_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
|
||||
"""
|
||||
Сравнивает данные для обновления с текущими значениями пользователя.
|
||||
Возвращает:
|
||||
- None, если нет изменений
|
||||
- Словарь {поле: новое_значение} для измененных полей
|
||||
"""
|
||||
update_values = {}
|
||||
changes = {}
|
||||
|
||||
for field, value in update_data.model_dump(exclude_unset=True).items():
|
||||
if value is None:
|
||||
continue
|
||||
|
||||
if isinstance(value, (AccountRole, AccountStatus)):
|
||||
update_values[field] = value.value
|
||||
else:
|
||||
update_values[field] = value
|
||||
|
||||
for field, new_value in update_values.items():
|
||||
if not hasattr(user, field):
|
||||
continue
|
||||
|
||||
current_value = getattr(user, field)
|
||||
|
||||
if isinstance(current_value, Enum):
|
||||
current_value = current_value.value
|
||||
|
||||
if current_value != new_value:
|
||||
changes[field] = new_value
|
||||
|
||||
return changes if changes else None
|
||||
|
||||
|
||||
def update_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
|
||||
"""
|
||||
Сравнивает данные для обновления с текущими значениями пользователя.
|
||||
Возвращает:
|
||||
- None, если нет изменений
|
||||
- Словарь {поле: новое_значение} для измененных полей
|
||||
"""
|
||||
update_values = {}
|
||||
changes = {}
|
||||
|
||||
for field, value in update_data.model_dump(exclude_unset=True).items():
|
||||
if value is None:
|
||||
continue
|
||||
|
||||
if isinstance(value, (KeyType, KeyStatus)):
|
||||
update_values[field] = value.value
|
||||
else:
|
||||
update_values[field] = value
|
||||
|
||||
for field, new_value in update_values.items():
|
||||
if not hasattr(key, field):
|
||||
continue
|
||||
|
||||
current_value = getattr(key, field)
|
||||
|
||||
if isinstance(current_value, Enum):
|
||||
current_value = current_value.value
|
||||
|
||||
if current_value != new_value:
|
||||
changes[field] = new_value
|
||||
|
||||
return changes if changes else None
|
||||
@ -1,13 +0,0 @@
|
||||
from fastapi import (
|
||||
HTTPException,
|
||||
status,
|
||||
)
|
||||
from api.db.logic.account import get_user_by_login
|
||||
from api.db.tables.account import AccountRole
|
||||
|
||||
|
||||
async def db_user_role_validation(connection, current_user):
|
||||
authorize_user = await get_user_by_login(connection, current_user)
|
||||
if authorize_user.role not in {AccountRole.OWNER, AccountRole.ADMIN}:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="You do not have enough permissions")
|
||||
return authorize_user
|
||||
@ -1,16 +0,0 @@
|
||||
import hashlib
|
||||
|
||||
# Хешер для работы с паролем.
|
||||
|
||||
|
||||
class Hasher:
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
def hash_data(self, password: str) -> str:
|
||||
# Хеширует пароль с использованием SHA-256.
|
||||
return hashlib.sha256(password.encode()).hexdigest()
|
||||
|
||||
def verify_data(self, password: str, hashed: str) -> bool:
|
||||
# Проверяет пароль путем сравнения его хеша с сохраненным хешем.
|
||||
return self.hash_data(password) == hashed
|
||||
@ -1,62 +0,0 @@
|
||||
import os
|
||||
import asyncio
|
||||
import hashlib
|
||||
import secrets
|
||||
|
||||
from api.db.connection.session import get_connection
|
||||
from api.db.tables.account import account_table, account_keyring_table, AccountRole, KeyType, KeyStatus
|
||||
from api.utils.key_id_gen import KeyIdGenerator
|
||||
|
||||
INIT_LOCK_FILE = "../init.lock"
|
||||
DEFAULT_LOGIN = "vorkout"
|
||||
|
||||
|
||||
def hash_password(password: str) -> str:
|
||||
return hashlib.sha256(password.encode()).hexdigest()
|
||||
|
||||
|
||||
def generate_password() -> str:
|
||||
return secrets.token_urlsafe(20)
|
||||
|
||||
|
||||
async def init():
|
||||
if os.path.exists(INIT_LOCK_FILE):
|
||||
print("Sorry, service is already initialized")
|
||||
return
|
||||
|
||||
async with get_connection() as conn:
|
||||
password = generate_password()
|
||||
hashed_password = hash_password(password)
|
||||
|
||||
create_user_query = account_table.insert().values(
|
||||
name=DEFAULT_LOGIN,
|
||||
login=DEFAULT_LOGIN,
|
||||
role=AccountRole.OWNER,
|
||||
)
|
||||
|
||||
res = await conn.execute(create_user_query)
|
||||
user_id = res.lastrowid
|
||||
|
||||
create_key_query = account_keyring_table.insert().values(
|
||||
owner_id=user_id,
|
||||
key_type=KeyType.PASSWORD,
|
||||
key_id=KeyIdGenerator(),
|
||||
key_value=hashed_password,
|
||||
status=KeyStatus.ACTIVE,
|
||||
)
|
||||
|
||||
await conn.execute(create_key_query)
|
||||
|
||||
await conn.commit()
|
||||
|
||||
await conn.close()
|
||||
|
||||
with open(INIT_LOCK_FILE, "w") as lock_file:
|
||||
lock_file.write("initialized\n")
|
||||
|
||||
print(f"Login: {DEFAULT_LOGIN}")
|
||||
print(f"Password: {password}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.get_event_loop().run_until_complete(init())
|
||||
@ -1,10 +0,0 @@
|
||||
import random
|
||||
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}"
|
||||
return result
|
||||
917
api/poetry.lock
generated
917
api/poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "api"
|
||||
version = "0.0.3"
|
||||
version = "0.0.1"
|
||||
description = ""
|
||||
authors = [
|
||||
{name = "Vladislav",email = "vlad.dev@heado.ru"}
|
||||
@ -11,24 +11,14 @@ dependencies = [
|
||||
"sqlalchemy[pymysql,aiomysql] (>=2.0.39,<3.0.0)",
|
||||
"alembic (>=1.15.1,<2.0.0)",
|
||||
"aio-pika (>=9.5.5,<10.0.0)",
|
||||
"fastapi[standard] (>=0.115.11,<0.116.0)",
|
||||
"fastapi[standart] (>=0.115.11,<0.116.0)",
|
||||
"uvicorn (>=0.34.0,<0.35.0)",
|
||||
"loguru (>=0.7.3,<0.8.0)",
|
||||
"pydantic-settings (>=2.8.1,<3.0.0)",
|
||||
"cryptography (>=44.0.2,<45.0.0)",
|
||||
"pydantic[email] (>=2.11.3,<3.0.0)",
|
||||
"python-multipart (>=0.0.20,<0.0.21)",
|
||||
"fastapi-jwt-auth @ git+https://github.com/vvpreo/fastapi-jwt-auth",
|
||||
]
|
||||
|
||||
|
||||
[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"]
|
||||
|
||||
1174
client/package-lock.json
generated
1174
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,9 +1,8 @@
|
||||
{
|
||||
"name": "client",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.1",
|
||||
"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",
|
||||
@ -12,13 +11,8 @@
|
||||
"@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"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 443 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 193 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 352 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 744 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 195 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 392 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 176 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 228 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 246 B |
@ -1,3 +0,0 @@
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 256 B |
@ -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>VORKOUT</title>
|
||||
<title>React App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
|
||||
@ -1,19 +1,7 @@
|
||||
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">
|
||||
<Routes>
|
||||
<Route path="/login" element={<div>login</div>} />
|
||||
<Route element={<ProtectedRoute />}>
|
||||
<Route path="*" element={<MainLayout />}></Route>
|
||||
</Route>
|
||||
</Routes>
|
||||
</div>
|
||||
);
|
||||
return <div className="App"></div>;
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
||||
@ -1,161 +0,0 @@
|
||||
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>
|
||||
);
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
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>
|
||||
);
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
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}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@ -1,229 +0,0 @@
|
||||
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>
|
||||
);
|
||||
}
|
||||
@ -1,113 +0,0 @@
|
||||
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>
|
||||
);
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
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>
|
||||
);
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
export const theme = {
|
||||
token: {
|
||||
fontFamily: 'Roboto, sans-serif',
|
||||
colorPrimary: '#C2DA3D',
|
||||
Menu: {
|
||||
itemColor: 'f2f2f2',
|
||||
itemBg: '#f2f2f2',
|
||||
subMenuItemBg: '#f2f2f2',
|
||||
iconSize: '18px',
|
||||
},
|
||||
Layout: {
|
||||
bodyBg: '#f2f2f2',
|
||||
},
|
||||
},
|
||||
};
|
||||
@ -1,74 +0,0 @@
|
||||
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;
|
||||
@ -11,34 +11,3 @@ 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;
|
||||
}
|
||||
|
||||
@ -2,17 +2,8 @@ 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(
|
||||
<AppWrapper>
|
||||
<BrowserRouter>
|
||||
<App />
|
||||
</BrowserRouter>
|
||||
</AppWrapper>
|
||||
);
|
||||
root.render(<App />);
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
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>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import Header from '../components/Header';
|
||||
|
||||
export default function ConfigurationPage() {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Header title={t('configuration')} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import Header from '../components/Header';
|
||||
|
||||
export default function EventsListPage() {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Header title={t('eventsList')} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,87 +0,0 @@
|
||||
/* 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>
|
||||
);
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import Header from '../components/Header';
|
||||
|
||||
export default function ProcessDiagramPage() {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Header title={t('processDiagrams')} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
// ProtectedRoute.js
|
||||
import { Outlet } from 'react-router-dom';
|
||||
import React from 'react';
|
||||
|
||||
const ProtectedRoute = (): React.JSX.Element => {
|
||||
return <Outlet />;
|
||||
};
|
||||
export default ProtectedRoute;
|
||||
@ -1,11 +0,0 @@
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import Header from '../components/Header';
|
||||
|
||||
export default function RunningProcessesPage() {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Header title={t('runningProcesses')} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -3,13 +3,13 @@ version: "3.1"
|
||||
services:
|
||||
rabbitmq:
|
||||
image: rabbitmq:4-management-alpine
|
||||
container_name: rabbitmq-connect
|
||||
container_name: rabbitmq
|
||||
ports:
|
||||
- 5672:5672
|
||||
- 15672:15672
|
||||
db:
|
||||
image: mysql:8.0
|
||||
container_name: mysql-connect
|
||||
container_name: mysql
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: hackme
|
||||
MYSQL_DATABASE: connect_test
|
||||
@ -21,7 +21,7 @@ services:
|
||||
- "3306:3306"
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: redis-connect
|
||||
container_name: redis
|
||||
command: redis-server --requirepass password
|
||||
environment:
|
||||
REDIS_PASSWORD: hackme
|
||||
|
||||
Loading…
Reference in New Issue
Block a user