Merge pull request #36 from DogukanUrker/main

changes
DogukanUrker · Jan 15, 2024 · 967abe1 · 967abe1
2 parents 6239ec6 + 0a07b9b
commit 967abe1
Show file tree

Hide file tree

Showing 38 changed files with 203 additions and 515 deletions.
diff --git a/constants.py b/constants.py
@@ -1,14 +1,14 @@
 from helpers import secrets, socket
 
-APP_HOST = socket.gethostbyname(socket.gethostname())  # FLASK APP'S HOST/PORT
-DEBUG_MODE = True  # TURN ON/OFF FLASK DEBUG MODE
-TAILWIND_UI = False  # SELECT TAILWIND-UI/STANDARD-UI
-LOG_IN = True  # TURN ON/OFF USER LOG IN UP
-REGISTRATION = True  # TURN ON/OFF USER SIGN UP
+APP_HOST = socket.gethostbyname(socket.gethostname())  # FLASK APP'S HOST/PORT.
+DEBUG_MODE = True  # TURN ON/OFF FLASK DEBUG MODE.
+TAILWIND_UI = False  # SELECT TAILWIND-UI/STANDARD-UI.
+LOG_IN = True  # TURN ON/OFF USER LOG IN UP.
+REGISTRATION = True  # TURN ON/OFF USER SIGN UP.
 LOG_FILE_ROOT = "log.log"  # ROOT OF THE LOG FILE FROM WHERE MESSAGES ARE PRINTED FROM THE MESSAGE MODULE.
-DB_FOLDER_ROOT = "db"  # ROOT OF THE DATABASE FOLDER WHERE .db FILES ARE LOCATED
-DB_USERS_ROOT = DB_FOLDER_ROOT + "/users.db"  # ROOT OF THE USERS DATABASE
-DB_POSTS_ROOT = DB_FOLDER_ROOT + "/posts.db"  # ROOT OF THE POSTS DATABASE
-DB_COMMENTS_ROOT = DB_FOLDER_ROOT + "/comments.db"  # ROOT OF THE COMMENTS DATABASE
-APP_SECRET_KEY = secrets.token_urlsafe(32)  # FLASK APP'S SECRET KEY
-SESSION_PERMANENT = True  # FLASK APP'S SESSIONS
+DB_FOLDER_ROOT = "db"  # ROOT OF THE DATABASE FOLDER WHERE .db FILES ARE LOCATED.
+DB_USERS_ROOT = DB_FOLDER_ROOT + "/users.db"  # ROOT OF THE USERS DATABASE.
+DB_POSTS_ROOT = DB_FOLDER_ROOT + "/posts.db"  # ROOT OF THE POSTS DATABASE.
+DB_COMMENTS_ROOT = DB_FOLDER_ROOT + "/comments.db"  # ROOT OF THE COMMENTS DATABASE.
+APP_SECRET_KEY = secrets.token_urlsafe(32)  # FLASK APP'S SECRET KEY.
+SESSION_PERMANENT = True  # FLASK APP'S SESSIONS.
diff --git a/delete.py b/delete.py
@@ -1,15 +1,23 @@
-from helpers import sqlite3, message, redirect, session
+from helpers import (
+    sqlite3,
+    message,
+    session,
+    redirect,
+    DB_POSTS_ROOT,
+    DB_USERS_ROOT,
+    DB_COMMENTS_ROOT,
+)
 
 
 def deletePost(postID):
-    connection = sqlite3.connect("db/posts.db")
+    connection = sqlite3.connect(DB_POSTS_ROOT)
     cursor = connection.cursor()
     cursor.execute(f"select author from posts where id = {postID}")
     cursor.execute(f"delete from posts where id = {postID}")
     cursor.execute(f"update sqlite_sequence set seq = seq-1")
     connection.commit()
     connection.close()
-    connection = sqlite3.connect("db/comments.db")
+    connection = sqlite3.connect(DB_COMMENTS_ROOT)
     cursor = connection.cursor()
     cursor.execute(f"select count(*) from comments where post = {postID}")
     commentCount = list(cursor)[0][0]
@@ -20,7 +28,7 @@ def deletePost(postID):
 
 
 def deleteUser(userName):
-    connection = sqlite3.connect("db/users.db")
+    connection = sqlite3.connect(DB_USERS_ROOT)
     cursor = connection.cursor()
     cursor.execute(f'select * from users where lower(userName) = "{userName.lower()}"')
     cursor.execute(f'select role from users where userName = "{session["userName"]}"')
@@ -38,7 +46,7 @@ def deleteUser(userName):
 
 
 def deleteComment(commentID):
-    connection = sqlite3.connect("db/comments.db")
+    connection = sqlite3.connect(DB_COMMENTS_ROOT)
     cursor = connection.cursor()
     cursor.execute(f"select user from comments where id = {commentID}")
     cursor.execute(f"delete from comments where id = {commentID}")

diff --git a/helpers.py b/helpers.py
@@ -8,7 +8,7 @@
 from random import randint
 from os.path import exists
 from datetime import datetime
-from constants import LOG_FILE_ROOT
+from constants import LOG_FILE_ROOT, DB_USERS_ROOT, DB_POSTS_ROOT, DB_COMMENTS_ROOT
 from email.message import EmailMessage
 from passlib.hash import sha256_crypt
 from flask import render_template, Blueprint
@@ -67,7 +67,7 @@ def message(color, message):
 
 
 def addPoints(points, user):
-    connection = sqlite3.connect("db/users.db")
+    connection = sqlite3.connect(DB_USERS_ROOT)
     cursor = connection.cursor()
     cursor.execute(
         f'update users set points = points+{points} where userName = "{user}"'
@@ -77,7 +77,7 @@ def addPoints(points, user):
 
 
 def getProfilePicture(userName):
-    connection = sqlite3.connect("db/users.db")
+    connection = sqlite3.connect(DB_USERS_ROOT)
     cursor = connection.cursor()
     cursor.execute(
         f'select profilePicture from users where lower(userName) = "{userName.lower()}"'

diff --git a/routes/accountSettings.py b/routes/accountSettings.py
@@ -1,10 +1,11 @@
 from helpers import (
+    request,
+    sqlite3,
     session,
     redirect,
-    render_template,
     Blueprint,
-    request,
-    sqlite3,
+    DB_USERS_ROOT,
+    render_template,
 )
 from delete import deleteUser
 
@@ -15,7 +16,7 @@
 def accountSettings():
     match "userName" in session:
         case True:
-            connection = sqlite3.connect("db/users.db")
+            connection = sqlite3.connect(DB_USERS_ROOT)
             cursor = connection.cursor()
             cursor.execute(
                 f'select userName from users where userName = "{session["userName"]}"'

diff --git a/routes/adminPanel.py b/routes/adminPanel.py
@@ -1,4 +1,11 @@
-from helpers import sqlite3, render_template, Blueprint, session, redirect
+from helpers import (
+    sqlite3,
+    session,
+    redirect,
+    Blueprint,
+    DB_USERS_ROOT,
+    render_template,
+)
 
 adminPanelBlueprint = Blueprint("adminPanel", __name__)
 
@@ -7,7 +14,7 @@
 def adminPanel():
     match "userName" in session:
         case True:
-            connection = sqlite3.connect("db/users.db")
+            connection = sqlite3.connect(DB_USERS_ROOT)
             cursor = connection.cursor()
             cursor.execute(
                 f'select role from users where userName = "{session["userName"]}"'

diff --git a/routes/adminPanelComments.py b/routes/adminPanelComments.py
@@ -1,10 +1,12 @@
 from helpers import (
+    request,
     sqlite3,
-    render_template,
-    Blueprint,
     session,
     redirect,
-    request,
+    Blueprint,
+    DB_USERS_ROOT,
+    render_template,
+    DB_COMMENTS_ROOT,
 )
 from delete import deleteComment
 
@@ -16,7 +18,7 @@
 def adminPanelComments():
     match "userName" in session:
         case True:
-            connection = sqlite3.connect("db/users.db")
+            connection = sqlite3.connect(DB_USERS_ROOT)
             cursor = connection.cursor()
             cursor.execute(
                 f'select role from users where userName = "{session["userName"]}"'
@@ -28,7 +30,7 @@ def adminPanelComments():
                     return redirect(f"/admin/comments")
             match role == "admin":
                 case True:
-                    connection = sqlite3.connect("db/comments.db")
+                    connection = sqlite3.connect(DB_COMMENTS_ROOT)
                     cursor = connection.cursor()
                     cursor.execute("select * from comments")
                     comments = cursor.fetchall()

diff --git a/routes/adminPanelPosts.py b/routes/adminPanelPosts.py
@@ -1,10 +1,12 @@
 from helpers import (
     sqlite3,
-    render_template,
-    Blueprint,
     session,
-    redirect,
     request,
+    redirect,
+    Blueprint,
+    DB_POSTS_ROOT,
+    DB_USERS_ROOT,
+    render_template,
 )
 from delete import deletePost
 
@@ -16,7 +18,7 @@
 def adminPanelPosts():
     match "userName" in session:
         case True:
-            connection = sqlite3.connect("db/users.db")
+            connection = sqlite3.connect(DB_USERS_ROOT)
             cursor = connection.cursor()
             cursor.execute(
                 f'select role from users where userName = "{session["userName"]}"'
@@ -27,7 +29,7 @@ def adminPanelPosts():
                     deletePost(request.form["postID"])
             match role == "admin":
                 case True:
-                    connection = sqlite3.connect("db/posts.db")
+                    connection = sqlite3.connect(DB_POSTS_ROOT)
                     cursor = connection.cursor()
                     cursor.execute("select * from posts")
                     posts = cursor.fetchall()

diff --git a/routes/adminPanelUsers.py b/routes/adminPanelUsers.py
@@ -1,10 +1,11 @@
 from helpers import (
     sqlite3,
-    render_template,
-    Blueprint,
     session,
-    redirect,
     request,
+    redirect,
+    Blueprint,
+    DB_USERS_ROOT,
+    render_template,
 )
 from delete import deleteUser
 
@@ -16,7 +17,7 @@
 def adminPanelUsers():
     match "userName" in session:
         case True:
-            connection = sqlite3.connect("db/users.db")
+            connection = sqlite3.connect(DB_USERS_ROOT)
             cursor = connection.cursor()
             cursor.execute(
                 f'select role from users where userName = "{session["userName"]}"'
@@ -27,7 +28,7 @@ def adminPanelUsers():
                     deleteUser(request.form["userName"])
             match role == "admin":
                 case True:
-                    connection = sqlite3.connect("db/users.db")
+                    connection = sqlite3.connect(DB_USERS_ROOT)
                     cursor = connection.cursor()
                     cursor.execute("select * from users")
                     users = cursor.fetchall()

diff --git a/routes/changePassword.py b/routes/changePassword.py
@@ -1,13 +1,14 @@
 from helpers import (
+    flash,
     session,
     sqlite3,
     request,
-    flash,
     message,
     redirect,
-    render_template,
     Blueprint,
     sha256_crypt,
+    DB_USERS_ROOT,
+    render_template,
     changePasswordForm,
 )
 
@@ -23,7 +24,7 @@ def changePassword():
                 oldPassword = request.form["oldPassword"]
                 password = request.form["password"]
                 passwordConfirm = request.form["passwordConfirm"]
-                connection = sqlite3.connect("db/users.db")
+                connection = sqlite3.connect(DB_USERS_ROOT)
                 cursor = connection.cursor()
                 cursor.execute(
                     f'select password from users where userName = "{session["userName"]}"'
@@ -35,7 +36,7 @@ def changePassword():
                         flash("passwords must match", "error")
                     elif oldPassword != password and password == passwordConfirm:
                         newPassword = sha256_crypt.hash(password)
-                        connection = sqlite3.connect("db/users.db")
+                        connection = sqlite3.connect(DB_USERS_ROOT)
                         cursor = connection.cursor()
                         cursor.execute(
                             f'update users set password = "{newPassword}" where userName = "{session["userName"]}"'

diff --git a/routes/changeProfilePicture.py b/routes/changeProfilePicture.py
@@ -1,12 +1,13 @@
 from helpers import (
+    flash,
     session,
     sqlite3,
     request,
-    flash,
     message,
     redirect,
-    render_template,
     Blueprint,
+    DB_USERS_ROOT,
+    render_template,
     changeProfilePictureForm,
 )
 
@@ -21,7 +22,7 @@ def changeProfilePicture():
             if request.method == "POST":
                 newProfilePictureSeed = request.form["newProfilePictureSeed"]
                 newProfilePicture = f"https://api.dicebear.com/7.x/identicon/svg?seed={newProfilePictureSeed}&radius=10"
-                connection = sqlite3.connect("db/users.db")
+                connection = sqlite3.connect(DB_USERS_ROOT)
                 cursor = connection.cursor()
                 cursor.execute(
                     f'update users set profilePicture = "{newProfilePicture}" where userName = "{session["userName"]}" '

diff --git a/routes/changeUserName.py b/routes/changeUserName.py
@@ -1,12 +1,15 @@
 from helpers import (
+    flash,
     session,
     sqlite3,
     request,
-    flash,
     message,
     redirect,
-    render_template,
     Blueprint,
+    DB_POSTS_ROOT,
+    DB_USERS_ROOT,
+    render_template,
+    DB_COMMENTS_ROOT,
     changeUserNameForm,
 )
 
@@ -21,7 +24,7 @@ def changeUserName():
             if request.method == "POST":
                 newUserName = request.form["newUserName"]
                 newUserName = newUserName.replace(" ", "")
-                connection = sqlite3.connect("db/users.db")
+                connection = sqlite3.connect(DB_USERS_ROOT)
                 cursor = connection.cursor()
                 cursor.execute(
                     f'select userName from users where userName = "{newUserName}"'
@@ -39,13 +42,13 @@ def changeUserName():
                                             f'update users set userName = "{newUserName}" where userName = "{session["userName"]}" '
                                         )
                                         connection.commit()
-                                        connection = sqlite3.connect("db/posts.db")
+                                        connection = sqlite3.connect(DB_POSTS_ROOT)
                                         cursor = connection.cursor()
                                         cursor.execute(
                                             f'update posts set Author = "{newUserName}" where author = "{session["userName"]}" '
                                         )
                                         connection.commit()
-                                        connection = sqlite3.connect("db/comments.db")
+                                        connection = sqlite3.connect(DB_COMMENTS_ROOT)
                                         cursor = connection.cursor()
                                         cursor.execute(
                                             f'update comments set user = "{newUserName}" where user = "{session["userName"]}" '

diff --git a/routes/createPost.py b/routes/createPost.py
@@ -1,16 +1,17 @@
 from helpers import (
+    flash,
     session,
     sqlite3,
     request,
-    flash,
     message,
     redirect,
     addPoints,
+    Blueprint,
     currentDate,
     currentTime,
-    render_template,
-    Blueprint,
+    DB_POSTS_ROOT,
     createPostForm,
+    render_template,
 )
 
 createPostBlueprint = Blueprint("createPost", __name__)
@@ -33,7 +34,7 @@ def createPost():
                             f'POST CONTENT NOT BE EMPTY USER: "{session["userName"]}"',
                         )
                     case False:
-                        connection = sqlite3.connect("db/posts.db")
+                        connection = sqlite3.connect(DB_POSTS_ROOT)
                         cursor = connection.cursor()
                         cursor.execute(
                             "insert into posts(title,tags,content,author,views,date,time,lastEditDate,lastEditTime) \