From 61c8cadb8710edb76ae991da74d2a28e98948b2b Mon Sep 17 00:00:00 2001 From: finn Date: Sun, 4 Aug 2024 13:14:58 -0700 Subject: [PATCH] mgt c9 complete --- backend/app/forms.py | 4 +++ backend/app/routes.py | 58 ++++++++++++++++++++------------ backend/app/templates/_post.html | 13 +++++-- backend/app/templates/base.html | 7 ++-- backend/app/templates/index.html | 18 +++++++++- backend/app/templates/user.html | 3 ++ backend/config.py | 1 + 7 files changed, 75 insertions(+), 29 deletions(-) diff --git a/backend/app/forms.py b/backend/app/forms.py index 4825c86..5d50a5c 100644 --- a/backend/app/forms.py +++ b/backend/app/forms.py @@ -43,6 +43,10 @@ class EditProfileForm(FlaskForm): if user is not None: raise ValidationError('Please use a different username.') +class PostForm(FlaskForm): + post = TextAreaField('Post:', validators=[DataRequired(), Length(min=1, max=140)]) + submit = SubmitField('Submit') + class EmptyForm(FlaskForm): submit = SubmitField('Submit') diff --git a/backend/app/routes.py b/backend/app/routes.py index 921db5a..d2ae9a9 100644 --- a/backend/app/routes.py +++ b/backend/app/routes.py @@ -5,8 +5,8 @@ from datetime import datetime, timezone import sqlalchemy as sa from app import app, db -from app.forms import LoginForm, RegistrationForm, EditProfileForm, EmptyForm -from app.models import User +from app.forms import LoginForm, RegistrationForm, EditProfileForm, EmptyForm, PostForm +from app.models import User, Post @app.before_request def before_request(): @@ -14,25 +14,37 @@ def before_request(): current_user.last_seen = datetime.now(timezone.utc) db.session.commit() -@app.route('/') -@app.route('/index') +@app.route('/', methods=['GET', 'POST']) +@app.route('/index', methods=['GET', 'POST']) @login_required def index(): app.logger.info('@@@@@@@@@@@@@@@@@ INFO LOG TEST INDEX') + form = PostForm() + #user = {'username': 'aaa', 'email': 'a@a.a'} + if form.validate_on_submit(): + post = Post(body=form.post.data, author=current_user) + db.session.add(post) + db.session.commit() + flash('Your post has been added.') + return redirect(url_for('index')) + #posts = db.session.scalars(current_user.following_posts()).all() + page = request.args.get('page', 1, type=int) + posts = db.paginate(current_user.following_posts(), page=page, per_page=app.config['POSTS_PER_PAGE'], error_out=False) + next_url = url_for('index', page=posts.next_num) if posts.has_next else None + prev_url = url_for('index', page=posts.prev_num) if posts.has_prev else None - user = {'username': 'Finnaa'} - posts = [ - { - 'author': {'username': 'john'}, - 'body': 'Beautiful day 1' - }, - { - 'author': {'username': 'susie'}, - 'body': 'Movie is good.' - } - ] - #return posts; - return render_template('index.html', title='Home', posts=posts) + return render_template('index.html', title='Home', form=form, posts=posts.items, next_url=next_url, prev_url=prev_url) + +@app.route('/explore') +@login_required +def explore(): + query = sa.select(Post).order_by(Post.timestamp.desc()) + page = request.args.get('page', 1, type=int) + posts = db.paginate(query, page=page, per_page=app.config['POSTS_PER_PAGE'], error_out=False) + next_url = url_for('explore', page=posts.next_num) if posts.has_next else None + prev_url = url_for('explore', page=posts.prev_num) if posts.has_prev else None + + return render_template('index.html', title='Explore', posts=posts.items, next_url=next_url, prev_url=prev_url) @app.route('/login', methods=['GET', 'POST']) def login(): @@ -75,12 +87,14 @@ def register(): @login_required def user(username): user = db.first_or_404(sa.select(User).where(User.username == username)) - posts = [ - {'author': user, 'body': 'Test1'}, - {'author': user, 'body': 'Test2?'} - ] + page = request.args.get('page', 1, type=int) + query = user.posts.select().order_by(Post.timestamp.desc()) + posts = db.paginate(query, page=page, per_page=app.config['POSTS_PER_PAGE'], error_out=False) + next_url = url_for('user', username=user.username, page=posts.next_num) if posts.has_next else None + prev_url = url_for('user', username=user.username, page=posts.prev_num) if posts.has_prev else None + form = EmptyForm() - return render_template('user.html', user=user, posts=posts, form=form) + return render_template('user.html', user=user, posts=posts.items, next_url=next_url, prev_url=prev_url, form=form) @app.route('/edit_profile', methods=['GET', 'POST']) @login_required diff --git a/backend/app/templates/_post.html b/backend/app/templates/_post.html index 58f0f6c..dd71e87 100644 --- a/backend/app/templates/_post.html +++ b/backend/app/templates/_post.html @@ -1,6 +1,13 @@ - - - + + +
{{ post.author.username }} says:
{{ post.body }}
+ + + + {{ post.author.username }} + says:
+ {{ post.body }} +
diff --git a/backend/app/templates/base.html b/backend/app/templates/base.html index 1c5890a..51c3d51 100644 --- a/backend/app/templates/base.html +++ b/backend/app/templates/base.html @@ -3,19 +3,20 @@ {% if title %} - {{ title }} - blog + {{ title }} - blogpage {% else %} Welcome to blog. {% endif %}
- blgo: + blog: home + explore {% if current_user.is_anonymous %} login {% else %} - Profile + profile logout {% endif %} diff --git a/backend/app/templates/index.html b/backend/app/templates/index.html index e2b6d0b..c6d27f4 100644 --- a/backend/app/templates/index.html +++ b/backend/app/templates/index.html @@ -2,9 +2,25 @@ {% block content %}

Hello, {{ current_user.username }}!

+ {% if form %} +
+ {{ form.hidden_tag() }} +

+ {{ form.post.label }} + {{ form.post(cols=32, rows=4) }} + {% for error in form.post.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+ {% endif %} {% for post in posts %} -

{{ post.author.username }} says: {{ post.body }}

+ {% include '_post.html' %} {% endfor %} + {% if prev_url %}Newer Posts{% endif %} + {% if next_url %}Older Posts{% endif %} + {% endblock %} diff --git a/backend/app/templates/user.html b/backend/app/templates/user.html index d4c6918..a4c5d8c 100644 --- a/backend/app/templates/user.html +++ b/backend/app/templates/user.html @@ -38,5 +38,8 @@ {% for post in posts %} {% include '_post.html' %} {% endfor %} + {% if prev_url %}Newer Posts{% endif %} + {% if next_url %}Older Posts{% endif %} + {% endblock %} diff --git a/backend/config.py b/backend/config.py index d05ad60..f6b5a7f 100644 --- a/backend/config.py +++ b/backend/config.py @@ -18,5 +18,6 @@ class Config: FROM_ADDRESS = os.environ.get('FROM_ADDRESS') DC_LOGGING = True + POSTS_PER_PAGE=5