Оптимизация структуры проекта

bot/__init__.py

@@ -0,0 +1,5 @@
+import bot.database
+import bot.config
+import bot.functions
+import bot.keyboards
+import bot.dispatcher

database.py

@@ -1,5 +1,5 @@
 import mysql.connector
-import config as conf
+from bot import config as conf
 
 
 class Database:

dispatcher.py

@@ -1,6 +1,6 @@
 from aiogram import Bot
 from aiogram.dispatcher import Dispatcher
-from config import BOT_TOKEN
+from bot.config import BOT_TOKEN
 from aiogram.contrib.fsm_storage.memory import MemoryStorage
 
 

keyboards.py

@@ -60,7 +60,7 @@ def make_calendar():
     keyboard = InlineKeyboardMarkup(row_width=7)
     button_today = InlineKeyboardButton(text="Сегодня", callback_data="today")
     button_tomorrow = InlineKeyboardButton(text="Завтра", callback_data="tomorrow")
-    button_after_tomorrow = InlineKeyboardButton(text="Послезавтра",callback_data="after_tomorrow")
+    button_after_tomorrow = InlineKeyboardButton(text="Послезавтра", callback_data="after_tomorrow")
 
     for i in range(1, days_in_month+1, 1):
         date_i = InlineKeyboardButton(text=str(i), callback_data=f"date_{str(i)}.{str(month)}")

draft.py

@@ -1,25 +1,3 @@
-# @dp.callback_query_handler(text_contains='menu_1')
-# async def menu(call: types.CallbackQuery):
-#     await bot.answer_callback_query(call.id)
-#     await bot.edit_message_reply_markup(call.message.chat.id, call.message.message_id, reply_markup=make_keyboard()
-#
-#
-# @dp.callback_query_handler(text='menu_4')
-# async def xyi(call: types.CallbackQuery):
-#     await bot.answer_callback_query(call.id)
-#     await bot.send_message(call.from_user.id, text="пошел нахуй со своим расписанием")
-
-
-# Класс состояний для бронирования
-# from aiogram.dispatcher.filters.state import StatesGroup, State
-# class BookingState(StatesGroup):
-#     owner = State()
-#     time = State()
-#     description = State()
-#     group = State()
-#     persons = State()
-
-
 # async def user_manage(message: types.Message):
 #     if not sql_check_user(f"select tg_id from user_table where tg_id ={message.from_user.id}") or \
 #             not sql_simple_check(f"select approved from user_table where tg_id={message.from_user.id}", "approved"):
@@ -46,11 +24,6 @@
 #     await bot.answer_callback_query(call.id)
 #     await bot.send_message(call.message.chat.id, "Вы выбрали " + call.data)
 
-
-
-
-
-
 # sql_query_users(f"select name,phone from user_table where approved = '0'")
 # print(sql_simple_check(f"select approved from user_table where tg_id='338836490'"))
 # print(sql_parse_users(f"select id, name,phone from user_table where approved = '0'"))

handlers/__init__.py

@@ -1,6 +1,6 @@
 import handlers.admin.admin_menu
 import handlers.admin.manage_users
 import handlers.admin.manage_events
-import handlers.registration
-import handlers.comands
-import handlers.events
+import handlers.user.registration
+import handlers.start
+import handlers.user.events

handlers/admin/admin_menu.py

@@ -1,6 +1,6 @@
 from aiogram import types, Dispatcher
-from keyboards import register_kb, main_kb, admin_keyboard
-import database
+from bot.keyboards import register_kb, main_kb, admin_keyboard
+from bot import database
 
 
 async def enter_admin_menu(message: types.message):

handlers/admin/manage_users.py

@@ -1,7 +1,7 @@
-import database
+from bot import database
 from aiogram import types, Dispatcher
-from functions import beauty_reg_request
-from keyboards import user_manage_kb
+from bot.functions import beauty_reg_request
+from bot.keyboards import user_manage_kb
 
 
 async def list_users(message: types.Message):

handlers/comands.py

@@ -1,6 +1,6 @@
 from aiogram import types, Dispatcher
-from keyboards import main_kb, register_kb,   check_register_kb
-import database
+from bot.keyboards import main_kb, register_kb,   check_register_kb
+from bot import database
 
 
 # @dp.message_handler(commands=['start'])

handlers/user/__init__.py

@@ -0,0 +1,3 @@
+import handlers.user.registration
+import handlers.user.events
+import handlers.user.states

handlers/events.py

@@ -1,7 +1,7 @@
 from aiogram import types, Dispatcher
-import database
-from keyboards import register_kb, make_calendar
-from functions import make_date
+from bot import database
+from bot.keyboards import register_kb, make_calendar
+from bot.functions import make_date
 
 
 async def make_event(message: types.message):
@@ -18,8 +18,6 @@ async def make_event(message: types.message):
                                  f"Так же календарь мероприятий можно посмотреть в "
                                  f"<a href=moodle.tomtit.tomsk.ru>Moodle</a>\n\n"
                                  f"Сегодняшняя дата <b>{make_date()}</b>", reply_markup=make_calendar())
-            # msg = await message.answer("asd")
-            # print(msg)
 
 
 async def select_date(call: types.CallbackQuery):

handlers/registration.py

@@ -1,9 +1,9 @@
 from aiogram import types, Dispatcher
-from states import RegisterStates
-from functions import validate_fio, validate_phone, reject_latin, reject_cmd
+from handlers.user.states import RegisterStates
+from bot.functions import validate_fio, validate_phone, reject_latin, reject_cmd
 from aiogram.dispatcher.storage import FSMContext
-from keyboards import reset_register_kb, register_kb, main_kb, check_register_kb
-import database
+from bot.keyboards import reset_register_kb, register_kb, main_kb, check_register_kb
+from bot import database
 
 
 async def registration(message: types.Message):

main.py

@@ -1,12 +1,12 @@
 from aiogram.utils import executor
-from dispatcher import dp
+from bot.dispatcher import dp
 import handlers.admin.admin_menu
 
 
 if __name__ == '__main__':
-    handlers.registration.register_handlers(dp)
-    handlers.comands.main_register(dp)
-    handlers.events.events_register(dp)
+    handlers.user.registration.register_handlers(dp)
+    handlers.start.main_register(dp)
+    handlers.user.events.events_register(dp)
     handlers.admin.admin_menu.register_admin_menu(dp)
     handlers.admin.manage_users.admin_handlers(dp)
     executor.start_polling(dp, skip_updates=True)