diff --git a/app/__init__.py b/app/__init__.py index 07fb623..7855b0e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -32,10 +32,15 @@ def create_app(): app.wsgi_app, x_for=1, x_proto=1 ) - from app.users.models import User + import app.users.models as user_models + import app.campaigns.models as campaign_models + import app.main.models as main_models + + + @login_manager.user_loader def load_user(user_id): - user = User.query.get(user_id) + user = user_models.User.query.get(user_id) if user: return user else: diff --git a/app/__pycache__/__init__.cpython-311.pyc b/app/__pycache__/__init__.cpython-311.pyc index 7eb143d..d2ecd53 100644 Binary files a/app/__pycache__/__init__.cpython-311.pyc and b/app/__pycache__/__init__.cpython-311.pyc differ diff --git a/app/campaigns/__pycache__/models.cpython-311.pyc b/app/campaigns/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000..5a3c834 Binary files /dev/null and b/app/campaigns/__pycache__/models.cpython-311.pyc differ diff --git a/app/main/__pycache__/models.cpython-311.pyc b/app/main/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000..f08f1ae Binary files /dev/null and b/app/main/__pycache__/models.cpython-311.pyc differ diff --git a/app/main/models.py b/app/main/models.py index 479cfba..c6055de 100644 --- a/app/main/models.py +++ b/app/main/models.py @@ -11,5 +11,5 @@ class Donation(db.Model): id = Column('id', INTEGER(), primary_key=True, autoincrement=True) currency_type = Column('currency_type', TEXT(), nullable=False) amount = Column('amount', INTEGER(), nullable=False) - campaign = db.relationship('Campaign', backref='Donation', lazy='dynamic') - user = db.relationship('User', backref='Donation', lazy='dynamic') \ No newline at end of file + campaign = db.relationship('campaign', backref='donation', lazy='dynamic') + user = db.relationship('user', backref='donation', lazy='dynamic') \ No newline at end of file diff --git a/app/users/__pycache__/models.cpython-311.pyc b/app/users/__pycache__/models.cpython-311.pyc index 0eec007..1101129 100644 Binary files a/app/users/__pycache__/models.cpython-311.pyc and b/app/users/__pycache__/models.cpython-311.pyc differ