some chages

Author: elvis-kture

.gitignore

@@ -1,3 +1,5 @@
 .idea/
 __pycache__/
 config.py
+venv
+venv/*

Sova.jpg

@@ -34,7 +34,7 @@ def handle_message(message):
                         state='main_menu_state'
                         )
             user.save()
-    #     get_state_and_process(message, user)
+        get_state_and_process(message, user)
     # except Exception as e:
     #     print(e)
 

bot_handlers.py

@@ -1,11 +1,26 @@
 from telebot import types
 from languages import DICTIONARY
 
-
 def get_main_menu_keyboard(language='ua'):
     keyboard = types.ReplyKeyboardMarkup(resize_keyboard=True)
     keyboard.add(DICTIONARY[language]['choose_school_button'])
     keyboard.add(DICTIONARY[language]['faq_button'])
     keyboard.add(DICTIONARY[language]['useful_info_button'])
     keyboard.add(DICTIONARY[language]['excursion_button'])
     return keyboard
+
+
+def get_faq_mon_keyboard(language='ua'):
+    keyboard = types.ReplyKeyboardMarkup(resize_keyboard=True)
+    keyboard.add(DICTIONARY[language]['faq_mon_btn'])
+    keyboard.add(DICTIONARY[language]['ask_mon_btn'])
+    keyboard.add(DICTIONARY[language]['back_button'])
+    return keyboard
+
+
+def get_excursion_button_keyboard(language='ua'):
+    keyboard = types.ReplyKeyboardMarkup(resize_keyboard=True)
+    keyboard.add(DICTIONARY[language]['excursion_1_1'])
+    keyboard.add(DICTIONARY[language]['excursion_1_2'])
+    keyboard.add(DICTIONARY[language]['excursion_1_3'])
+    return keyboard

keyboards.py

@@ -4,6 +4,15 @@
         'choose_school_button': 'Найближча школа',
         'faq_button': 'Задати питання МОН',
         'useful_info_button': 'Корисна інформація',
-        'excursion_button': 'Екскурсія НУШ'
+        'excursion_button': 'Екскурсія НУШ',
+        'ask_mon_question_msg': '___Zadaty___',
+        'faq_mon_btn': 'FAQ',
+        'ask_mon_btn': 'Ask mon',
+        'back_button': '<-back',
+        # excursion steps
+        'excursion_1_1': 'Новая Парта',
+        'excursion_1_2': 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDUwIDUwIiBoZWlnaHQ9IjUwcHgiIGlkPSJMYXllcl8xIiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCA1MCA1MCIgd2lkdGg9IjUwcHgiIHhtbDpzcGFjZT0icHJlc2VydmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxyZWN0IGZpbGw9Im5vbmUiIGhlaWdodD0iNTAiIHdpZHRoPSI1MCIvPjxwYXRoIGQ9Ik0zNC4zOTcsMjlMMjAsNDhMNS42MDQsMjkgIEgxNUMxNSwwLDQ0LDEsNDQsMVMyNSwyLjM3MywyNSwyOUgzNC4zOTd6IiBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2Utd2lkdGg9IjIiLz48L3N2Zz4=',
+        'excursion_1_3': '<-back',
+        'excursion_1_1_1': '<-back'
     },
 }

languages.py

@@ -1,7 +1,10 @@
 from database import User
 from states import *
 
-states = {'main_menu_state': main_menu_state}
+states = {'main_menu_state': main_menu_state,
+          'ask_question_mon_state': ask_question_mon_state,
+          'excursion_state': excursion_state
+          }
 
 
 def get_state_and_process(message, user: User, is_entry=False):

state_handler.py

@@ -9,5 +9,32 @@ def main_menu_state(message, user, is_entry=False):
                          DICTIONARY['ua']['main_menu_msg'],
                          reply_markup=get_main_menu_keyboard('ua'))
     else:
-        pass
+        if message.text == DICTIONARY['ua']['excursion_button']:
+            return True, 'excursion_state'
+        if message.text == DICTIONARY['ua']['faq_button']:
+            return True, 'ask_question_mon_state'
+
+    return False, ''
+
+
+def ask_question_mon_state(message, user, is_entry=False):
+    if is_entry:
+        bot.send_message(message.chat.id,
+                         DICTIONARY['ua']['ask_mon_question_msg'],
+                         reply_markup=get_faq_mon_keyboard('ua'))
+    else:
+        if message.text == DICTIONARY['ua']['back_button']:
+            return True, 'main_menu_state'
+    return False, ''
+
+
+def excursion_state(message, user, is_entry=False):
+    if is_entry:
+        bot.send_photo(message.chat.id,
+                       photo=open('Sova.jpg', 'rb'),
+                       # photo='https://telegram.org/img/t_logo.png',
+                       reply_markup=get_excursion_button_keyboard('ua'))
+    else:
+        if message.text == DICTIONARY['ua']['back_button']:
+            return True, 'main_menu_state'
     return False, ''