From a23d7fffdc4c8febafc5d21353eab7820f598617 Mon Sep 17 00:00:00 2001 From: hteppl Date: Wed, 15 Jan 2025 03:37:01 +0300 Subject: [PATCH] Admin keyboards adjustments --- keyboards/admin/coupons_kb.py | 4 +++- keyboards/admin/panel_kb.py | 3 +++ keyboards/admin/sender_kb.py | 1 + keyboards/admin/servers_kb.py | 9 +++++++-- keyboards/admin/stats_kb.py | 1 + keyboards/admin/users_kb.py | 4 ++++ 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/keyboards/admin/coupons_kb.py b/keyboards/admin/coupons_kb.py index 99277f1d..0d024a05 100644 --- a/keyboards/admin/coupons_kb.py +++ b/keyboards/admin/coupons_kb.py @@ -32,7 +32,9 @@ def build_coupons_list_kb(coupons: list) -> InlineKeyboardMarkup: coupon_code = coupon["code"] builder.button( text=f"❌ Удалить {coupon_code}", - callback_data=AdminCouponDeleteCallback(coupon_code=coupon_code), + callback_data=AdminCouponDeleteCallback( + coupon_code=coupon_code + ).pack(), ) builder.row( diff --git a/keyboards/admin/panel_kb.py b/keyboards/admin/panel_kb.py index 56cff519..2786dbd5 100644 --- a/keyboards/admin/panel_kb.py +++ b/keyboards/admin/panel_kb.py @@ -43,6 +43,7 @@ def build_panel_kb() -> InlineKeyboardMarkup: text="👤 Личный кабинет", callback_data="profile" ) + builder.adjust(1, 1, 2, 1) return builder.as_markup() @@ -63,6 +64,7 @@ def build_management_kb() -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("admin") ) + builder.adjust(1) return builder.as_markup() @@ -75,6 +77,7 @@ def build_restart_kb() -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("admin") ) + builder.adjust(1) return builder.as_markup() diff --git a/keyboards/admin/sender_kb.py b/keyboards/admin/sender_kb.py index 502c8c4b..5d9155a7 100644 --- a/keyboards/admin/sender_kb.py +++ b/keyboards/admin/sender_kb.py @@ -32,4 +32,5 @@ def build_sender_kb() -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("admin") ) + builder.adjust(1) return builder.as_markup() diff --git a/keyboards/admin/servers_kb.py b/keyboards/admin/servers_kb.py index e598356c..dc974c92 100644 --- a/keyboards/admin/servers_kb.py +++ b/keyboards/admin/servers_kb.py @@ -29,6 +29,7 @@ def build_clusters_editor_kb(servers: dict) -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("admin") ) + builder.adjust(1) return builder.as_markup() @@ -66,8 +67,9 @@ def build_manage_cluster_kb(cluster_servers, cluster_name) -> InlineKeyboardMark ).pack() ) builder.row( - build_admin_back_btn("servers_editor") + build_admin_back_btn("servers") ) + builder.adjust(1) return builder.as_markup() @@ -87,6 +89,7 @@ def build_manage_server_kb(server_name: str, cluster_name: str) -> InlineKeyboar data=cluster_name ).pack() ) + builder.adjust(1) return builder.as_markup() @@ -106,6 +109,7 @@ def build_delete_server_kb(server_name: str) -> InlineKeyboardMarkup: data=server_name ).pack() ) + builder.adjust(1) return builder.as_markup() @@ -114,7 +118,8 @@ def build_cancel_kb() -> InlineKeyboardMarkup: builder.row( InlineKeyboardButton( text="❌ Отменить", - callback_data="servers_editor" + callback_data="servers" ) ) + builder.adjust(1) return builder.as_markup() diff --git a/keyboards/admin/stats_kb.py b/keyboards/admin/stats_kb.py index 3e3b9b04..c6b34404 100644 --- a/keyboards/admin/stats_kb.py +++ b/keyboards/admin/stats_kb.py @@ -21,4 +21,5 @@ def build_stats_kb() -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("admin") ) + builder.adjust(1) return builder.as_markup() diff --git a/keyboards/admin/users_kb.py b/keyboards/admin/users_kb.py index 062d81e4..57d7941c 100644 --- a/keyboards/admin/users_kb.py +++ b/keyboards/admin/users_kb.py @@ -46,6 +46,7 @@ def build_user_edit_kb(tg_id: int, key_records: list) -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("users_editor") ) + builder.adjust(1) return builder.as_markup() @@ -61,6 +62,7 @@ def build_user_delete_kb(tg_id: int): builder.row( build_admin_back_btn("users_editor") ) + builder.adjust(1) return builder.as_markup() @@ -96,6 +98,7 @@ def build_key_edit_kb(key_details: dict, email: str) -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("users_editor") ) + builder.adjust(1) return builder.as_markup() @@ -113,4 +116,5 @@ def build_key_delete_kb(client_id: str) -> InlineKeyboardMarkup: builder.row( build_admin_back_btn("users_editor") ) + builder.adjust(1) return builder.as_markup()