diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..4992876 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + { + "customColor": "", + "associatedIndex": 8 +} + + + + + + + + + + + + + + + 1734543527156 + + + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/services/user.py + + + + + + + + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c25fdd0..d3e7d39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,6 @@ Flask -<<<<<<< HEAD -sqlalchemy -flask_bcrypt -flask_sqlalchemy -python-dotenv -======= flask_bcrypt flask_cors flask_sqlalchemy python-dotenv -werkzeug ->>>>>>> 81d9dbd ((feat): Updated requirements.txt) +werkzeug \ No newline at end of file diff --git a/server.py b/server.py index b656bba..cd38ee1 100644 --- a/server.py +++ b/server.py @@ -3,11 +3,14 @@ from flask import Flask from models import db, bcrypt from routes.auth import auth_bp from dotenv import load_dotenv +from flask_cors import CORS load_dotenv() app = Flask(__name__) +CORS(app) + app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE') app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False @@ -20,4 +23,4 @@ with app.app_context(): db.create_all() if __name__ == '__main__': - app.run(debug=True) \ No newline at end of file + app.run(debug=True)