refactoring

bot/handlers/menu/main.py

@@ -5,8 +5,6 @@ from aiogram.types import Message, CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from logging import getLogger
 from sqlmodel.ext.asyncio.session import AsyncSession
-
-from ....main import QBotApp
 from ....model.settings import Settings
 from ....model.user import UserBase
 from ..context import ContextData, CallbackCommand
@@ -17,15 +15,15 @@ logger = getLogger(__name__)
 router = Router()
 
 
-@router.message(Command("menu"))
-async def command_menu(message: Message, **kwargs):
+# @router.message(Command("menu"))
+# async def command_menu(message: Message, **kwargs):
 
-    await clear_state(state = kwargs["state"], clear_nav = True)
-    callback_data = ContextData(command = CallbackCommand.MENU_ENTRY_MAIN)
-    stack = await save_navigation_context(callback_data = callback_data, state = kwargs["state"])
-    kwargs.update({"navigation_stack": stack, "callback_data": callback_data})
+#     await clear_state(state = kwargs["state"], clear_nav = True)
+#     callback_data = ContextData(command = CallbackCommand.MENU_ENTRY_MAIN)
+#     stack = await save_navigation_context(callback_data = callback_data, state = kwargs["state"])
+#     kwargs.update({"navigation_stack": stack, "callback_data": callback_data})
 
-    await main_menu(message, **kwargs)
+#     await main_menu(message, **kwargs)
         
 
 # @router.callback_query(CallbackData.filter(F.command == CallbackCommand.MENU_ENTRY))
@@ -77,6 +75,8 @@ from .language import router as language_router
 from ..editors import router as editors_router
 from ..forms.entity_list import router as entity_list_router
 from ..forms.entity_form import router as entity_form_router
+from ..common import router as common_router
+from ..user_handlers import router as user_handlers_router
 
 router.include_routers(
     entities_router,
@@ -85,7 +85,9 @@ router.include_routers(
     language_router,
     editors_router,
     entity_list_router,
-    entity_form_router
+    entity_form_router,
+    common_router,
+    user_handlers_router
 )
 
 from ..navigation import save_navigation_context, pop_navigation_context, clear_state