From b3b188f3704dc1e766d1bb6af3c5444de001e24d Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 5 Aug 2024 01:28:09 -0700 Subject: [PATCH] mgt c10 complete merge to put bootstrap css changes on their own fork --- backend/app/email.py | 7 ++++++- backend/app/models.py | 2 +- backend/app/routes.py | 8 +------- backend/app/templates/base.html | 9 ++++++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/backend/app/email.py b/backend/app/email.py index cbf8f9e..d5db7f4 100644 --- a/backend/app/email.py +++ b/backend/app/email.py @@ -1,12 +1,17 @@ +from threading import Thread from flask import render_template from flask_mail import Message from app import mail, app +def send_async_email(app, msg): + with app.app_context(): + mail.send(msg) + def send_email(subject, sender, recipients, text_body, html_body): msg = Message(subject, sender=sender, recipients=recipients) msg.body = text_body msg.html = html_body - mail.send(msg) + Thread(target=send_async_email, args=(app, msg)).start() def send_password_reset_email(user): token = user.get_reset_password_token() diff --git a/backend/app/models.py b/backend/app/models.py index dc71998..e93f60b 100644 --- a/backend/app/models.py +++ b/backend/app/models.py @@ -10,7 +10,7 @@ from app import db, login, app from flask_login import UserMixin #debug -import sys +#import sys followers = sa.Table( 'followers', diff --git a/backend/app/routes.py b/backend/app/routes.py index 0b3f724..c644031 100644 --- a/backend/app/routes.py +++ b/backend/app/routes.py @@ -10,7 +10,7 @@ from app.models import User, Post from app.email import send_password_reset_email #debug: -import sys +#import sys @app.before_request def before_request(): @@ -90,15 +90,12 @@ def register(): @app.route('/reset_password/', methods=['GET', 'POST']) def reset_password(token): if current_user.is_authenticated: - print('rp user is authed', file=sys.stderr) return redirect(url_for('index')) user = User.verify_reset_password_token(token) if not user: - print('rp not user', file=sys.stderr) return redirect(url_for('index')) form = ResetPasswordForm() if form.validate_on_submit(): - print('rp validated', file=sys.stderr) user.set_password(form.password.data) db.session.commit() flash('Your password has been reset.') @@ -175,14 +172,11 @@ def unfollow(username): @app.route('/reset_password_request', methods=['GET', 'POST']) def reset_password_request(): if current_user.is_authenticated: - print('rpr user is authed', file=sys.stderr) return redirect(url_for('index')) form = ResetPasswordRequestForm() if form.validate_on_submit(): - print('rpr form validated', file=sys.stderr) user = db.session.scalar(sa.select(User).where(User.email == form.email.data)) if user: - print('rpr if user', file=sys.stderr) send_password_reset_email(user) flash('Password reset sent.') return redirect(url_for('login')) diff --git a/backend/app/templates/base.html b/backend/app/templates/base.html index 51c3d51..ff4f233 100644 --- a/backend/app/templates/base.html +++ b/backend/app/templates/base.html @@ -9,8 +9,8 @@ {% endif %} -
- blog: +
+
+ +

oily.dad

+

destroy me

+
{% with messages = get_flashed_messages() %} {% if messages %}