From 626ababdc37c34989a2789c62735c7d58137d557 Mon Sep 17 00:00:00 2001
From: finn <git@hot.oily.dad>
Date: Sat, 3 Aug 2024 05:34:12 -0700
Subject: [PATCH] mgt c6 done

---
 backend/app/routes.py                          | 18 +++++++++---------
 backend/app/templates/user.html                |  4 +++-
 .../{1a0e4f823e90_.py => 4a2c3a72038e_.py}     |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename backend/migrations/versions/{1a0e4f823e90_.py => 4a2c3a72038e_.py} (95%)

diff --git a/backend/app/routes.py b/backend/app/routes.py
index b11bcde..666d7aa 100644
--- a/backend/app/routes.py
+++ b/backend/app/routes.py
@@ -1,13 +1,19 @@
 from flask import render_template, flash, redirect, url_for, request
+from flask_login import current_user, login_user, logout_user, login_required
 from urllib.parse import urlsplit
 from datetime import datetime, timezone
+import sqlalchemy as sa
 
 from app import app, db
 from app.forms import LoginForm, RegistrationForm, EditProfileForm
-import sqlalchemy as sa
-from flask_login import current_user, login_user, logout_user, login_required
 from app.models import User
 
+@app.before_request
+def before_request():
+    if current_user.is_authenticated:
+        current_user.last_seen = datetime.now(timezone.utc)
+        db.session.commit()
+
 @app.route('/')
 @app.route('/index')
 @login_required
@@ -27,12 +33,6 @@ def index():
     #return posts;
     return render_template('index.html', title='Home', posts=posts)
 
-@app.before_request
-def before_request():
-    if current_user.is_authenticated:
-        current_user.last_seen = datetime.now(timezone.utc)
-        db.session.commit()
-
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     if current_user.is_authenticated:
@@ -92,6 +92,6 @@ def edit_profile():
         return redirect(url_for('edit_profile'))
     elif request.method == 'GET':
         form.username.data = current_user.username
-        form.about_me.data = current_user.about_me()
+        form.about_me.data = current_user.about_me
     return render_template('edit_profile.html', title='Edit Profile', form=form)
 
diff --git a/backend/app/templates/user.html b/backend/app/templates/user.html
index beac920..fbfe27e 100644
--- a/backend/app/templates/user.html
+++ b/backend/app/templates/user.html
@@ -6,12 +6,14 @@
 			<td><img src="data:image/png;base64,{{ user.gen_avatar(write_png=False) }}"></td>
 			<td>
 				<h1>User: {{ user.username }}</h1>
+				<h1>CUdebug: {{ current_user }}</h1>
+				<h1>Udebug: {{ user }}</h1>
 				{% if user.about_me %}<p>{{ user.about_me }}</p>{% endif %}
 				{% if user.last_seen %}<p>Last activity:{{ user.last_seen }}</p>{% endif %}
 			</td>
 		</tr>
 	</table>
-	{% if user == current_user() %}
+	{% if user == current_user %}
 	<p><a href="{{ url_for('edit_profile') }}">Edit Profile</a></p>
 	{% endif %}
 	<hr>
diff --git a/backend/migrations/versions/1a0e4f823e90_.py b/backend/migrations/versions/4a2c3a72038e_.py
similarity index 95%
rename from backend/migrations/versions/1a0e4f823e90_.py
rename to backend/migrations/versions/4a2c3a72038e_.py
index 87ac3e8..582776d 100644
--- a/backend/migrations/versions/1a0e4f823e90_.py
+++ b/backend/migrations/versions/4a2c3a72038e_.py
@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: 1a0e4f823e90
+Revision ID: 4a2c3a72038e
 Revises: 
-Create Date: 2024-08-03 04:56:53.822820
+Create Date: 2024-08-03 05:02:15.935738
 
 """
 from alembic import op
@@ -10,7 +10,7 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '1a0e4f823e90'
+revision = '4a2c3a72038e'
 down_revision = None
 branch_labels = None
 depends_on = None