diff --git a/app.py b/app.py index 624de80..fc0c9d4 100644 --- a/app.py +++ b/app.py @@ -1,3 +1,38 @@ -from src.app import create_app +from gevent import monkey +monkey.patch_all() -app = create_app() \ No newline at end of file +from werkzeug.serving import run_simple +from flask_cors import CORS +from pymongo import MongoClient + +from src.config import Config +from src.singletons.database_singleton import DatabaseSingleton + +from src.infra.server import app, socketio +from src.controllers.user_controller import user_blueprint +from src.controllers.reservation_controller import reservation_blueprint +from src.controllers.health_controller import health_blueprint +from src.controllers.room_controller import room_blueprint + +CORS(app) +app.config['JWT_SECRET_KEY'] = Config.JWT_SECRET_KEY + +app.register_blueprint(user_blueprint, url_prefix='/user') +app.register_blueprint(reservation_blueprint, url_prefix='/reservation') +app.register_blueprint(room_blueprint, url_prefix='/room') +app.register_blueprint(health_blueprint, url_prefix='/health') + +client = MongoClient(Config.MONGO_URI) +db = DatabaseSingleton.get_instance() + +if db is not None: + print('Connected to MongoDB') +else: + print('Failed to connect to MongoDB') + +def create_app(): + return app + +if __name__ == '__main__': + #app.run(debug=True) + socketio.run(app, host=Config.APP_HOST, debug=False) \ No newline at end of file diff --git a/run.bat b/run.bat index 4e1ca21..045aa88 100644 --- a/run.bat +++ b/run.bat @@ -19,5 +19,5 @@ if exist ".env" ( echo .env file not found. ) -python src/app.py +python app.py pause \ No newline at end of file diff --git a/src/app.py b/src/app.py deleted file mode 100644 index fc0c9d4..0000000 --- a/src/app.py +++ /dev/null @@ -1,38 +0,0 @@ -from gevent import monkey -monkey.patch_all() - -from werkzeug.serving import run_simple -from flask_cors import CORS -from pymongo import MongoClient - -from src.config import Config -from src.singletons.database_singleton import DatabaseSingleton - -from src.infra.server import app, socketio -from src.controllers.user_controller import user_blueprint -from src.controllers.reservation_controller import reservation_blueprint -from src.controllers.health_controller import health_blueprint -from src.controllers.room_controller import room_blueprint - -CORS(app) -app.config['JWT_SECRET_KEY'] = Config.JWT_SECRET_KEY - -app.register_blueprint(user_blueprint, url_prefix='/user') -app.register_blueprint(reservation_blueprint, url_prefix='/reservation') -app.register_blueprint(room_blueprint, url_prefix='/room') -app.register_blueprint(health_blueprint, url_prefix='/health') - -client = MongoClient(Config.MONGO_URI) -db = DatabaseSingleton.get_instance() - -if db is not None: - print('Connected to MongoDB') -else: - print('Failed to connect to MongoDB') - -def create_app(): - return app - -if __name__ == '__main__': - #app.run(debug=True) - socketio.run(app, host=Config.APP_HOST, debug=False) \ No newline at end of file diff --git a/src/controllers/room_controller.py b/src/controllers/room_controller.py index 7d0ace5..cfb3940 100644 --- a/src/controllers/room_controller.py +++ b/src/controllers/room_controller.py @@ -6,8 +6,8 @@ room_blueprint = Blueprint('room', __name__) #@jwt_required() def list_rooms(): return jsonify([ - {"id": "67d28e7004bda1d7130c9825", "title": "Маркетинг"}, - {"id": "67d28e7004bda1d7130c9826", "title": "Green"}, {"id": "67d28e7004bda1d7130c9827", "title": "Конференц-зал"}, + {"id": "67d28e7004bda1d7130c9826", "title": "Green"}, + {"id": "67d28e7004bda1d7130c9825", "title": "Маркетинг"}, {"id": "67d28e7004bda1d7130c9828", "title": "Dipal"} ]) \ No newline at end of file