diff --git a/app/keyboards/menu.py b/app/keyboards/menu.py index 66debc4..aee84c4 100644 --- a/app/keyboards/menu.py +++ b/app/keyboards/menu.py @@ -1,25 +1,20 @@ from aiogram.types import ReplyKeyboardMarkup, KeyboardButton -# Главное меню menu = ReplyKeyboardMarkup( keyboard=[ - [KeyboardButton(text="📅 Записаться")], - [ - KeyboardButton(text="👤 Профиль"), - KeyboardButton(text="📖 Мои записи") - ], - [ - KeyboardButton(text="ℹ️ О компании"), - KeyboardButton(text="📞 Контакты") - ] + [KeyboardButton(text="/start")], + [KeyboardButton(text="[services]")], + [KeyboardButton(text="[book]")], + [KeyboardButton(text="[mybookings]")], + [KeyboardButton(text="[contacts]")], + [KeyboardButton(text="[about]")], ], resize_keyboard=True ) -# Меню во время записи cancel_menu = ReplyKeyboardMarkup( keyboard=[ - [KeyboardButton(text="Отмена")] + [KeyboardButton(text="cancel")] ], resize_keyboard=True -) \ No newline at end of file +) diff --git a/app/keyboards/time_slots.py b/app/keyboards/time_slots.py index f5d5697..c7df3a0 100644 --- a/app/keyboards/time_slots.py +++ b/app/keyboards/time_slots.py @@ -6,11 +6,12 @@ def get_time_keyboard(busy_times): buttons = [] row = [] for slot in TIME_SLOTS: - if slot in busy_times: - label = f❌ {slot} + busy = slot in busy_times + if busy: + label = "[X] " + slot else: - label = f✅ {slot} - row.append(InlineKeyboardButton(text=label, callback_data=ftime_{slot})) + label = "[V] " + slot + row.append(InlineKeyboardButton(text=label, callback_data="time_" + slot)) if len(row) == 3: buttons.append(row) row = []