diff --git a/handlers/admin/backups/backups_handler.py b/handlers/admin/backups/backups_handler.py index 69ad7cc9..35d9c0e8 100644 --- a/handlers/admin/backups/backups_handler.py +++ b/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() diff --git a/handlers/admin/bans/bans_handler.py b/handlers/admin/bans/bans_handler.py index 44379b5a..28f44213 100644 --- a/handlers/admin/bans/bans_handler.py +++ b/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() diff --git a/keyboards/admin/bans_kb.py b/handlers/admin/bans/keyboard.py similarity index 87% rename from keyboards/admin/bans_kb.py rename to handlers/admin/bans/keyboard.py index 3c5c5145..e967ab04 100644 --- a/keyboards/admin/bans_kb.py +++ b/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: diff --git a/handlers/admin/coupons/coupons_handler.py b/handlers/admin/coupons/coupons_handler.py index b3bf4164..1c7bbe92 100644 --- a/handlers/admin/coupons/coupons_handler.py +++ b/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 diff --git a/keyboards/admin/coupons_kb.py b/handlers/admin/coupons/keyboard.py similarity index 95% rename from keyboards/admin/coupons_kb.py rename to handlers/admin/coupons/keyboard.py index 5a21a38d..f65480f1 100644 --- a/keyboards/admin/coupons_kb.py +++ b/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"): diff --git a/keyboards/admin/panel_kb.py b/handlers/admin/panel/keyboard.py similarity index 100% rename from keyboards/admin/panel_kb.py rename to handlers/admin/panel/keyboard.py diff --git a/handlers/admin/panel/panel_handler.py b/handlers/admin/panel/panel_handler.py index d940c2c7..6e244516 100644 --- a/handlers/admin/panel/panel_handler.py +++ b/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() diff --git a/handlers/admin/restart/restart_handler.py b/handlers/admin/restart/restart_handler.py index 9acc1195..12b4c013 100644 --- a/handlers/admin/restart/restart_handler.py +++ b/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() diff --git a/keyboards/admin/sender_kb.py b/handlers/admin/sender/keyboard.py similarity index 95% rename from keyboards/admin/sender_kb.py rename to handlers/admin/sender/keyboard.py index 82c37115..0a4991eb 100644 --- a/keyboards/admin/sender_kb.py +++ b/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"): diff --git a/handlers/admin/sender/sender_handler.py b/handlers/admin/sender/sender_handler.py index e85338aa..bfe33492 100644 --- a/handlers/admin/sender/sender_handler.py +++ b/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 diff --git a/keyboards/admin/servers_kb.py b/handlers/admin/servers/keyboard.py similarity index 97% rename from keyboards/admin/servers_kb.py rename to handlers/admin/servers/keyboard.py index e7d148e8..762c697d 100644 --- a/keyboards/admin/servers_kb.py +++ b/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"): diff --git a/handlers/admin/servers/servers_handler.py b/handlers/admin/servers/servers_handler.py index b1c6a67e..5ea58cd6 100644 --- a/handlers/admin/servers/servers_handler.py +++ b/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, diff --git a/keyboards/admin/stats_kb.py b/handlers/admin/stats/keyboard.py similarity index 90% rename from keyboards/admin/stats_kb.py rename to handlers/admin/stats/keyboard.py index b8046593..cc0c3167 100644 --- a/keyboards/admin/stats_kb.py +++ b/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: diff --git a/handlers/admin/stats/stats_handler.py b/handlers/admin/stats/stats_handler.py index 042036c7..92e68c33 100644 --- a/handlers/admin/stats/stats_handler.py +++ b/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 diff --git a/keyboards/admin/users_kb.py b/handlers/admin/users/keyboard.py similarity index 99% rename from keyboards/admin/users_kb.py rename to handlers/admin/users/keyboard.py index 72b24ad3..9697c526 100644 --- a/keyboards/admin/users_kb.py +++ b/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"): diff --git a/handlers/admin/users/users_handler.py b/handlers/admin/users/users_handler.py index 9e658fb9..c95780b1 100644 --- a/handlers/admin/users/users_handler.py +++ b/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, diff --git a/handlers/profile.py b/handlers/profile.py index 24f1ac2d..a76a4328 100644 --- a/handlers/profile.py +++ b/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 diff --git a/handlers/start.py b/handlers/start.py index e76c7514..7dd91283 100644 --- a/handlers/start.py +++ b/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 diff --git a/keyboards/admin/__init__.py b/keyboards/admin/__init__.py deleted file mode 100644 index e69de29b..00000000