BotCode/keyboards/__init__.py

@@ -2,19 +2,18 @@
 # Инициализация пакета keyboards, для работы с клавиатурами
 
 from aiogram import Router
-from .start_kb import router as start_kb_router
-from .help_kb import router as help_kb_router
-from .more_kb import router as more_kb_router
-
+from .inline_kb import router as inline_kb_router
+from .reply_kb import router as reply_kb_router
+from .inline_kb import *
+from .reply_kb import *
 
 # Объявление роутера и настройка экспорта модулей
-__all__ = ("router",)
+__all__ = ("router", "inline_kb", "reply_kb",)
 router = Router(name="kb_router")
 
 
 # Список подключаемых роутеров сверху-вниз
 router.include_routers(
-    start_kb_router,
-    help_kb_router,
-    more_kb_router,
+    inline_kb_router,
+    reply_kb_router,
 )

BotCode/keyboards/inline_kb/__init__.py

@@ -0,0 +1,14 @@
+# BotCode/keyboards/__init__.py
+# Инициализация пакета keyboards, для работы с клавиатурами
+
+from aiogram import Router
+from .actor_kb import *
+from .randnum_kb import *
+
+# Объявление роутера и настройка экспорта модулей
+__all__ = ("router", "actor_kb", "ButtonInl")
+router = Router(name="inline_kb_router")
+
+
+# Список подключаемых роутеров сверху-вниз
+# router.include_routers()

BotCode/keyboards/reply_kb/__init__.py

@@ -0,0 +1,20 @@
+# BotCode/keyboards/__init__.py
+# Инициализация пакета keyboards, для работы с клавиатурами
+
+from aiogram import Router
+from .start_kb import router as start_kb_router
+from .help_kb import router as help_kb_router
+from .more_kb import router as more_kb_router
+
+
+# Объявление роутера и настройка экспорта модулей
+__all__ = ("router",)
+router = Router(name="reply_kb_router")
+
+
+# Список подключаемых роутеров сверху-вниз
+router.include_routers(
+    start_kb_router,
+    help_kb_router,
+    more_kb_router,
+)

BotCode/routers/__init__.py

@@ -3,6 +3,7 @@
 # Пакет старых файлов отключен!!
 
 from aiogram import Router
+from .callback_handlers import router as callback_handlers_router
 from .commands.bot_command import set_commands
 from .administration import router as admin_head_router
 from .commands import router as commands_head_router
@@ -17,6 +18,7 @@ router = Router(name="main_router")
 
 # Список подключаемых роутеров сверху-вниз
 router.include_routers(
+callback_handlers_router,
     admin_head_router,
     commands_head_router,
     downloads_head_router,

BotCode/routers/callback_handlers/__init__.py

@@ -0,0 +1,13 @@
+from aiogram import Router
+
+from .actor_kb_cb import router as actor_kb_cb_router
+from .randnum_kb_cb import router as randnum_kb_cb_router
+
+__all__ = ("router", )
+router = Router(name="callback_handlers")
+
+# Список подключаемых роутеров сверху-вниз
+router.include_routers(
+    actor_kb_cb_router,
+    randnum_kb_cb_router,
+)

BotCode/routers/commands/user_cmd/__init__.py

@@ -7,6 +7,8 @@ from .help_cmd import router as help_router
 from .more_cmd import router as more_router
 from .exit_cmd import router as exit_router
 from .start_time_cmd import router as start_time_router
+from .actor_cmd import router as actor_router
+from .randnum_cmd import router as randnum_router
 
 
 # Объявление роутера и настройка экспорта модулей
@@ -20,6 +22,8 @@ router.include_routers(
     help_router,
     more_router,
     exit_router,
+    actor_router,
+    randnum_router,
 )
 
 

BotCode/routers/common/__init__.py

@@ -3,6 +3,7 @@
 
 from aiogram import Router
 from .messages import router as common_message_router
+from .phrase import router as phrase_message_router
 
 
 # Объявление роутера и настройка экспорта модулей
@@ -12,8 +13,8 @@ router = Router(name="users_head_router")
 
 # Список подключаемых роутеров сверху-вниз
 router.include_routers(
-    common_message_router,
+    phrase_message_router,
 )
 
 # Идет самым последним, если другие роутеры не сработали
-# router.include_router(common_message_router)
+router.include_router(common_message_router)