Move admin keyboards to their own packages

handlers/admin/backups/backups_handler.py

@@ -3,7 +3,7 @@ from aiogram.types import CallbackQuery
 
 from backup import backup_database
 from filters.admin import IsAdminFilter
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
 
 
 router = Router()

handlers/admin/bans/bans_handler.py

@@ -5,8 +5,8 @@ from aiogram.types import BufferedInputFile, CallbackQuery
 
 from database import delete_user_data
 from filters.admin import IsAdminFilter
-from keyboards.admin.bans_kb import build_bans_kb
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboard import build_bans_kb
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
 
 
 router = Router()

handlers/admin/bans/keyboard.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_btn
 
 
 def build_bans_kb() -> InlineKeyboardMarkup:

handlers/admin/coupons/coupons_handler.py

@@ -8,8 +8,8 @@ from config import USERNAME_BOT
 
 from database import create_coupon, delete_coupon, get_all_coupons
 from filters.admin import IsAdminFilter
-from keyboards.admin.coupons_kb import AdminCouponDeleteCallback, build_coupons_kb, build_coupons_list_kb
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboard import AdminCouponDeleteCallback, build_coupons_kb, build_coupons_list_kb
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
 from logger import logger
 
 

handlers/admin/coupons/keyboard.py

@@ -2,7 +2,7 @@ from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_btn
 
 
 class AdminCouponDeleteCallback(CallbackData, prefix="admin_coupon_delete"):

handlers/admin/panel/panel_handler.py

@@ -5,7 +5,7 @@ from aiogram.types import CallbackQuery, Message
 
 from bot import version
 from filters.admin import IsAdminFilter
-from keyboards.admin.panel_kb import AdminPanelCallback, build_management_kb, build_panel_kb
+from keyboard import AdminPanelCallback, build_management_kb, build_panel_kb
 
 
 router = Router()

handlers/admin/restart/restart_handler.py

@@ -4,7 +4,7 @@ from aiogram import F, Router
 from aiogram.types import CallbackQuery
 
 from filters.admin import IsAdminFilter
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb, build_restart_kb
+from handlers.admin.panel.keyboard import AdminPanelCallback, build_admin_back_kb, build_restart_kb
 
 
 router = Router()

handlers/admin/sender/keyboard.py

@@ -2,7 +2,7 @@ from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from keyboards.admin.panel_kb import build_admin_back_btn
+from ..panel.keyboard import build_admin_back_btn
 
 
 class AdminSenderCallback(CallbackData, prefix="admin_sender"):

handlers/admin/sender/sender_handler.py

@@ -7,8 +7,8 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import CallbackQuery, Message
 
 from filters.admin import IsAdminFilter
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
-from keyboards.admin.sender_kb import AdminSenderCallback, build_clusters_kb, build_sender_kb
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
+from keyboard import AdminSenderCallback, build_clusters_kb, build_sender_kb
 from logger import logger
 
 

handlers/admin/servers/keyboard.py

@@ -2,7 +2,7 @@ from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_btn
 
 
 class AdminServerEditorCallback(CallbackData, prefix="admin_servers"):

handlers/admin/servers/servers_handler.py

@@ -15,8 +15,8 @@ from backup import create_backup_and_send_to_admins
 from database import check_unique_server_name, delete_server, get_servers
 from filters.admin import IsAdminFilter
 from handlers.keys.key_utils import create_key_on_cluster
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
-from keyboards.admin.servers_kb import (
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
+from keyboard import (
     AdminServerEditorCallback,
     build_clusters_editor_kb,
     build_delete_server_kb,

handlers/admin/stats/keyboard.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_btn
 
 
 def build_stats_kb() -> InlineKeyboardMarkup:

handlers/admin/stats/stats_handler.py

@@ -8,8 +8,8 @@ from aiogram.exceptions import TelegramBadRequest
 from aiogram.types import CallbackQuery
 
 from filters.admin import IsAdminFilter
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
-from keyboards.admin.stats_kb import build_stats_kb
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
+from keyboard import build_stats_kb
 from logger import logger
 from utils.csv_export import export_payments_csv, export_users_csv
 

handlers/admin/users/keyboard.py

@@ -5,7 +5,7 @@ from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from config import RENEWAL_PRICES
 
-from keyboards.admin.panel_kb import build_admin_back_btn
+from ..panel.keyboard import build_admin_back_btn
 
 
 class AdminUserEditorCallback(CallbackData, prefix="admin_users"):

handlers/admin/users/users_handler.py

@@ -27,7 +27,7 @@ from database import (
 from filters.admin import IsAdminFilter
 from handlers.keys.key_utils import delete_key_from_cluster, get_user_traffic, renew_key_in_cluster, update_subscription
 from handlers.utils import sanitize_key_name
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb, build_admin_back_btn
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb, build_admin_back_btn
 from keyboards.admin.users_kb import (
     AdminUserEditorCallback,
     AdminUserKeyEditorCallback,

handlers/profile.py

@@ -41,7 +41,7 @@ from handlers.buttons.profile import (
     PAYMENT,
 )
 from handlers.texts import get_referral_link, invite_message_send, profile_message_send
-from keyboards.admin.panel_kb import AdminPanelCallback
+from ..panel.keyboard import AdminPanelCallback
 from logger import logger
 
 from .utils import edit_or_send_message

handlers/start.py

@@ -33,7 +33,7 @@ from database import (
 from handlers.captcha import generate_captcha
 from handlers.keys.key_management import create_key
 from handlers.texts import WELCOME_TEXT, get_about_vpn
-from keyboards.admin.panel_kb import AdminPanelCallback
+from ..panel.keyboard import AdminPanelCallback
 from logger import logger
 
 from .utils import edit_or_send_message