@login_required added to relevant routes.

portfolio/__init__.py

@@ -5,7 +5,6 @@ from dotenv import load_dotenv, dotenv_values
 from sqlalchemy.orm import declarative_base
 from flask_mail import Mail, Message
 from datetime import datetime
-from markdown import markdown
 from flask_bcrypt import Bcrypt
 from flask_login import LoginManager
 from flask_uuid import FlaskUUID
@@ -46,6 +45,7 @@ login_manager = LoginManager()
 login_manager.init_app(app)
 login_manager.login_view = 'login'
 
+
 # UUID
 uuid = FlaskUUID(app)
 

portfolio/routes.py

@@ -7,13 +7,13 @@ from dotenv import load_dotenv, dotenv_values
 from portfolio.forms import *
 import math
 from portfolio.utils import *
-from flask_login import login_user, current_user
+from flask_login import login_user, current_user, login_required, logout_user
 import uuid
 load_dotenv()
 
 @login_manager.user_loader
 def load_user(user_id):
-    return UserDAO.getUser(db,user_id)
+    return UserORM.query.get(user_id)
 
 
 @app.route("/")
@@ -86,6 +86,7 @@ def blogpost(slug):
 
 
 @app.route('/blog/new_blogpost', methods=['GET', 'POST'])
+@login_required
 def newBlogpost():
     form = Blogpost()
     if form.validate_on_submit():
@@ -105,6 +106,7 @@ def newBlogpost():
 
 
 @app.route('/blog/delete_post/<id>')
+@login_required
 def deleteBlogpost(id):
     BlogpostDAO.deleteBlogpostByID(db, id)
 
@@ -112,6 +114,7 @@ def deleteBlogpost(id):
 
 
 @app.route('/blog/delete_comment/<id>')
+@login_required
 def deleteComment(id):
     CommentDAO.deleteCommentByID(db, id)
 
@@ -119,11 +122,13 @@ def deleteComment(id):
 
 
 @app.route('/blog/add_comment/<post_id>', methods=['GET', 'POST'])
+@login_required
 def addComment(post_id):
+    print(current_user.username)
     form = Comment()
     if form.validate_on_submit():
         new_comment = CommentORM(
-            author = form.author.data,
+            author = current_user.username,
             comment = form.comment.data,
             timestamp = int(round(datetime.now().timestamp())),
             post_id = post_id
@@ -143,6 +148,7 @@ def login():
         if user:
             if bcrypt.check_password_hash(user.password, form.password.data):
                 login_user(user)
+                print(current_user.is_active)
                 return redirect(url_for('blog'))
     return render_template('login.html', form=form)
 
@@ -242,4 +248,10 @@ def resetPassword(uuid):
 
 @app.route('/linkExpired')
 def expired():
-    return render_template('linkExpired.html')
\ No newline at end of file
+    return render_template('linkExpired.html')
+
+@app.route("/logout")
+@login_required
+def logout():
+    logout_user()
+    return "<p> You have been logged out </p>"
\ No newline at end of file

portfolio/templates/newComment.html

@@ -3,8 +3,6 @@
 
 <form id="comment" method="post">
     {{ form.hidden_tag() }}
-    <label for="name">Name:</label>
-    {{ form.author(size=50)}}
     <br>
     <label for="comment">Comment</label>
     {{ form.comment(cols=30, rows=5)}}

portfolio/utils.py

 from datetime import datetime
+from markdown import markdown
+
 
 def to_slug_case(str):
     slug = ""