From ffd830a8fc476427e3b9a12d1cb1930e4220e336 Mon Sep 17 00:00:00 2001
From: karastoyanov on vivobook <karastoqnov.alexandar@gmail.com>
Date: Tue, 8 Oct 2024 13:05:37 +0300
Subject: [PATCH 01/13] update Dockerfile - downgrade to python 3.12.7 -
 compatibility issues with 3.13.0 and `greenlet` dependency

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a26abbb..b366081 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Use the base image containing Python 3.8, NodeJS, npm, mono-complete compiler and java compiler
-FROM python:latest
+FROM python:3.12.7
 
 # Image Labels. Update values for each build
 LABEL Name="Skill-Forge"

From b57ba17982bb091723160d96dc3084e2f77ec5e0 Mon Sep 17 00:00:00 2001
From: Raya Petkova <122923696+rayapetkova@users.noreply.github.com>
Date: Wed, 9 Oct 2024 22:49:47 +0300
Subject: [PATCH 02/13] Scroller ans whitespaces in bio section

---
 app/static/css/user_profile.css      | 5 ++++-
 app/templates/user_profile_view.html | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/static/css/user_profile.css b/app/static/css/user_profile.css
index 33dbbc2..499700c 100644
--- a/app/static/css/user_profile.css
+++ b/app/static/css/user_profile.css
@@ -133,7 +133,10 @@ body {
     text-align: justify;
     word-wrap: break-word;
     overflow-wrap: break-word;
-    overflow: hidden;
+}
+
+form textarea {
+    overflow-y: scroll;
 }
 
 
diff --git a/app/templates/user_profile_view.html b/app/templates/user_profile_view.html
index 70c0a6a..1a43809 100644
--- a/app/templates/user_profile_view.html
+++ b/app/templates/user_profile_view.html
@@ -82,7 +82,7 @@ <h2 class="text-xl font-bold mb-4 user_profile_info title">About Me</h2>
                         <div class="text-gray-900 rounded-lg 
                         focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:border-gray-600 
                         dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500
-                        user_profile_info about_me_field">{{user.about_me}}</div>
+                        user_profile_info about_me_field whitespace-pre-wrap">{{user.about_me}}</div>
                         <!-- User Info Section -->
                         <div class="grid gap-6 mb-6 md:grid-cols-2">
                             <div>

From 1064c76b8f0b4d9e39cbef98d39b79ba061bb021 Mon Sep 17 00:00:00 2001
From: Raya Petkova <122923696+rayapetkova@users.noreply.github.com>
Date: Wed, 9 Oct 2024 23:02:49 +0300
Subject: [PATCH 03/13] User-friendly flash messages

---
 app/routes/user_routes.py       | 15 ++++++++++++++-
 app/templates/user_profile.html | 10 +++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/routes/user_routes.py b/app/routes/user_routes.py
index 56beadd..bbe8ae3 100644
--- a/app/routes/user_routes.py
+++ b/app/routes/user_routes.py
@@ -20,6 +20,19 @@
 
 bp_usr = Blueprint('usr', __name__)
 
+fields_flash_messages = {
+    'about_me': 'About me',
+    'first_name': 'First name',
+    'last_name': 'Last name',
+    'email': 'Email',
+    'facebook_profile': 'Facebook profile',
+    'instagram_profile': 'Instagram profile',
+    'github_profile': 'GitHub profile',
+    'discord_id': 'Discord ID',
+    'linked_in': 'LinkedIn',
+    'avatar': 'Avatar'
+}
+
 #  Open the user profile page
 @bp_usr.route('/my_profile', methods=['GET', 'POST'])
 @login_required
@@ -77,7 +90,7 @@ def open_user_profile():
     else:
         for field, errors in form.errors.items():
             for error in errors:
-                flash(f'{field}: {error}', 'danger')
+                flash(f'{fields_flash_messages[field]}: {error}', 'danger')
                 return redirect(url_for('usr.open_user_profile'))
 
     if request.method == 'GET':
diff --git a/app/templates/user_profile.html b/app/templates/user_profile.html
index 6a5a70c..37512b8 100644
--- a/app/templates/user_profile.html
+++ b/app/templates/user_profile.html
@@ -31,11 +31,11 @@
     <div>
         <div class="container mx-auto py-8 user_profile_info">
             {% with messages = get_flashed_messages(with_categories=true) %}
-            {% if messages %}
-            {% for category, message in messages %}
-            <div class="alert alert-{{ category }}">{{ message }}</div>
-            {% endfor %}
-            {% endif %}
+                {% if messages %}
+                    {% for category, message in messages %}
+                        <div class="alert alert-{{ category }}">{{ message }}</div>
+                    {% endfor %}
+                {% endif %}
             {% endwith %}
             <div class="grid grid-cols-4 sm:grid-cols-12 gap-6 px-4">
                 <div class="col-span-4 sm:col-span-3">

From f9970905b85c68b213a16381f0c0821170cdee7d Mon Sep 17 00:00:00 2001
From: Raya Petkova <122923696+rayapetkova@users.noreply.github.com>
Date: Wed, 9 Oct 2024 23:07:09 +0300
Subject: [PATCH 04/13] Smaller bio container

---
 app/templates/user_profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/user_profile.html b/app/templates/user_profile.html
index 37512b8..2e09ff5 100644
--- a/app/templates/user_profile.html
+++ b/app/templates/user_profile.html
@@ -80,7 +80,7 @@ <h2 class="text-xl font-bold mb-4 user_profile_info title">About Me</h2>
                             {{ form.about_me (class="text-gray-900 rounded-lg 
                             focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:border-gray-600 
                             dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500
-                            user_profile_info about_me_field", placeholder="Share your story or interests. What makes you unique?", rows=10) }}
+                            user_profile_info about_me_field", placeholder="Share your story or interests. What makes you unique?", rows=7) }}
                             <div class="grid gap-6 mb-6 md:grid-cols-2">
                                 <div>
                                     <label for="first_name" class="block mb-2 font-medium text-gray-900 dark:text-white">First name</label>

From 9886bc75a09cc5d35a8ecf8136e97a6218621c1c Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexnadar@gmail.com>
Date: Sat, 12 Oct 2024 21:41:49 +0300
Subject: [PATCH 05/13] open submited quest form update

---
 app/routes/quests_routes.py            | 12 +---
 app/routes/user_submit_quest_routes.py | 81 +++++++++++++++++---------
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/app/routes/quests_routes.py b/app/routes/quests_routes.py
index 49ac68a..a0bb14e 100644
--- a/app/routes/quests_routes.py
+++ b/app/routes/quests_routes.py
@@ -6,7 +6,7 @@
 from app.models import Quest, ReportedQuest, User, SubmitedSolution, UserAchievement, Achievement, Comment
 from app.forms import QuestForm, PublishCommentForm, EditQuestForm, EditReportedQuestForm
 # Import code runners
-from app.code_runners import run_python, run_javascript, run_java, run_csharp
+from app.code_runners import run_javascript
 from app.code_runners.piston_api import code_runner
 # Import the database instance
 from app.database.db_init import db
@@ -152,8 +152,6 @@ def delete_comment(comment_id):
         flash('Comment deletion failed!', 'danger')
         return redirect(url_for('quests.open_curr_quest', quest_id=comment.quest_id))
 
-
-
 # Handle quest edit from the Admin Panel
 @bp_qst.route('/edit_quest', methods=['GET', 'POST'])
 def edit_quest_db():
@@ -264,7 +262,6 @@ def edit_reported_quest():
             flash('Form validation failed!', 'danger')
     return render_template('edit_quest.html', form=form)
 
-
 # Open Quest for editing from the Admin Panel
 @bp_qst.route('/edit_quest/<quest_id>', methods=['GET'])
 @login_required
@@ -288,7 +285,6 @@ def open_edit_quest(quest_id):
         flash('Quest not found!', 'danger')
         return redirect(url_for('usr.open_admin_panel')), 404
 
-
 # Open Reported Quest for editing from the Admin Panel
 @bp_qst.route('/edit_reported_quest/<report_id>')
 @login_required
@@ -312,7 +308,6 @@ def open_edit_reported_quest(report_id):
         flash('Quest not found!', 'danger')
         return redirect(url_for('usr.open_admin_panel')), 404
 
-
 # Route to handle `Report Quest` Button
 @bp_qst.route('/report_quest/<curr_quest_id>')
 @login_required
@@ -357,7 +352,6 @@ def report_quest(curr_quest_id, report_reason='no reason'):
     flash('Quest reported successfully! Administrator will review your report and will take actions shortly.', 'success')
     return redirect(url_for('main.main_page', quest_id=curr_quest_id))
 
-
 # Redirect to the table with all tasks. Change from template to real page!!!! 
 @bp_qst.route('/quests/<language>', methods=['GET'])
 @login_required
@@ -377,7 +371,7 @@ def open_quests_table(language):
     
     return render_template('quest_table.html', quests=all_quests, users=all_users, solved_quests=solved_quests, language=language) 
 
-# Open Quest for submitting. Change from template to real page!!!!
+# Open a specific quest
 @bp_qst.route('/quest/<quest_id>', methods=['GET'])
 @login_required
 def open_curr_quest(quest_id):
@@ -396,7 +390,7 @@ def open_curr_quest(quest_id):
                            user_role=user_role,
                            form=quest_post_form)
 
-# Route to handle solution submission
+# Submit Quest Solution
 @bp_qst.route('/submit-solution', methods=['POST'])
 @login_required
 def submit_solution():
diff --git a/app/routes/user_submit_quest_routes.py b/app/routes/user_submit_quest_routes.py
index b34d240..9a672e3 100644
--- a/app/routes/user_submit_quest_routes.py
+++ b/app/routes/user_submit_quest_routes.py
@@ -1,6 +1,6 @@
 import random, string, base64
 from datetime import datetime
-from flask import Blueprint, render_template, redirect, url_for, flash, current_app, request
+from flask import Blueprint, render_template, redirect, url_for, flash, request, abort
 from flask_login import login_required, current_user
 # Import the database instance
 from app.database.db_init import db
@@ -9,7 +9,7 @@
 # Import the forms and models
 from app.models import SubmitedQuest, Quest, User, Achievement, UserAchievement
 # Import the forms
-from app.forms import QuestSubmissionForm, QuestApprovalForm, EditQuestForm
+from app.forms import QuestSubmissionForm, QuestApprovalForm
 # Import admin_required decorator
 from app.user_permission import admin_required
 # Import the mail functions
@@ -27,7 +27,7 @@ def open_user_submit_quest():
     return render_template('user_submit_quest.html', form=form)
 
 
-# # Open User Submited Quest for editing from the Admin Panel
+#  Open User Submited Quest for editing from the Admin Panel
 @bp_usq.route('/open_submited_quest/<quest_id>', methods=['GET'])
 @login_required
 @admin_required
@@ -272,24 +272,36 @@ def post_comment():
                            user_role=user_role, 
                            user_id=user_id))
     
-
 # Route to open submited quest for editing as regular user
 @bp_usq.route('/edit_submited_quest/<quest_id>', methods=['GET'])
 @login_required
 def open_submited_quest_as_user(quest_id):
     submited_quest = SubmitedQuest.query.filter_by(quest_id=quest_id).first()
+    
+    # Throw 404 error if the user is not the author of the quest OR the user is not an admin
+    if current_user.username != submited_quest.quest_author and current_user.user_role != 'Admin':
+        abort(404)
+    
     form = QuestApprovalForm()
-    form.submited_quest_id.data = quest_id
-    form.submited_quest_name.data = submited_quest.quest_name
-    form.submited_quest_language.data = submited_quest.language
-    form.submited_quest_difficulty.data = submited_quest.difficulty
-    form.submited_quest_author.data = submited_quest.quest_author
-    form.submited_quest_date_added.data = submited_quest.date_added
-    form.submited_quest_condition.data = submited_quest.condition
-    form.submited_function_template.data = submited_quest.function_template
-    form.submited_quest_unitests.data = submited_quest.unit_tests
-    form.submited_quest_inputs.data = submited_quest.test_inputs
-    form.submited_quest_outputs.data = submited_quest.test_outputs
+    
+    try:
+        if form.validate_on_submit():
+            form.submited_quest_id.data = quest_id
+            form.submited_quest_name.data = submited_quest.quest_name
+            form.submited_quest_language.data = submited_quest.language
+            form.submited_quest_difficulty.data = submited_quest.difficulty
+            form.submited_quest_author.data = submited_quest.quest_author
+            form.submited_quest_date_added.data = submited_quest.date_added
+            form.submited_quest_condition.data = submited_quest.condition
+            form.submited_function_template.data = submited_quest.function_template
+            form.submited_quest_unitests.data = submited_quest.unit_tests
+            form.submited_quest_inputs.data = submited_quest.test_inputs
+            form.submited_quest_outputs.data = submited_quest.test_outputs
+    except:
+        flash('Quest update failed! Check the fields and try again', 'danger')
+        return render_template('edit_submited_quest_as_user.html', 
+                               submited_quest=submited_quest,
+                               form=form)
     
     return render_template('edit_submited_quest_as_user.html', 
                            submited_quest=submited_quest,
@@ -302,20 +314,31 @@ def update_submited_quest(quest_id):
     quest_id = form.submited_quest_id.data
     submited_quest = SubmitedQuest.query.filter_by(quest_id=quest_id).first()
     
-    if form.validate_on_submit():
-        submited_quest.quest_name = form.submited_quest_name.data
-        submited_quest.language = form.submited_quest_language.data
-        submited_quest.difficulty = form.submited_quest_difficulty.data
-        submited_quest.condition = form.submited_quest_condition.data
-        submited_quest.function_template = form.submited_function_template.data
-        submited_quest.unit_tests = form.submited_quest_unitests.data
-        submited_quest.test_inputs = form.submited_quest_inputs.data
-        submited_quest.test_outputs = form.submited_quest_outputs.data
-        submited_quest.last_modified = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        
-        db.session.commit()
-        flash('Quest updated successfully!', 'success')
-        return redirect(url_for('usq.open_submited_quest_as_user', quest_id=quest_id))
+    # Check if the quest is pending
+    if submited_quest.status != 'Pending':
+        flash('You can only edit pending quests!', 'danger')
+        return redirect(url_for('main.main_page'))
+    
+    try:
+        if form.validate_on_submit():
+            submited_quest.quest_name = form.submited_quest_name.data
+            submited_quest.language = form.submited_quest_language.data
+            submited_quest.difficulty = form.submited_quest_difficulty.data
+            submited_quest.condition = form.submited_quest_condition.data
+            submited_quest.function_template = form.submited_function_template.data
+            submited_quest.unit_tests = form.submited_quest_unitests.data
+            submited_quest.test_inputs = form.submited_quest_inputs.data
+            submited_quest.test_outputs = form.submited_quest_outputs.data
+            submited_quest.last_modified = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            
+            db.session.commit()
+            flash('Quest updated successfully!', 'success')
+            return redirect(url_for('usq.open_submited_quest_as_user', quest_id=quest_id))
+    except:
+        flash('Quest update failed! Check the fields and try again', 'danger')
+        return render_template('edit_submited_quest_as_user.html', 
+                               submited_quest=submited_quest,
+                               form=form)
     else:
         flash('Quest update failed! Check the fields and try again', 'danger')
         return render_template('edit_submited_quest_as_user.html', 

From 640849b0946c4aa34a7f5efbfdfe26122a357d51 Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexnadar@gmail.com>
Date: Sat, 12 Oct 2024 21:45:26 +0300
Subject: [PATCH 06/13] edit quest updated

---
 app/routes/quests_routes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/routes/quests_routes.py b/app/routes/quests_routes.py
index a0bb14e..9c5c711 100644
--- a/app/routes/quests_routes.py
+++ b/app/routes/quests_routes.py
@@ -154,6 +154,8 @@ def delete_comment(comment_id):
 
 # Handle quest edit from the Admin Panel
 @bp_qst.route('/edit_quest', methods=['GET', 'POST'])
+@login_required
+@admin_required
 def edit_quest_db():
     form = EditQuestForm()
     if request.method == 'POST':

From 4ef9a33f4308bb6bd25edd33cba4973a07158f27 Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexnadar@gmail.com>
Date: Sat, 12 Oct 2024 21:47:57 +0300
Subject: [PATCH 07/13] Comments reworked

---
 app/routes/quests_routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/quests_routes.py b/app/routes/quests_routes.py
index 9c5c711..561f60c 100644
--- a/app/routes/quests_routes.py
+++ b/app/routes/quests_routes.py
@@ -152,7 +152,7 @@ def delete_comment(comment_id):
         flash('Comment deletion failed!', 'danger')
         return redirect(url_for('quests.open_curr_quest', quest_id=comment.quest_id))
 
-# Handle quest edit from the Admin Panel
+# Open quest edit from the Admin Panel
 @bp_qst.route('/edit_quest', methods=['GET', 'POST'])
 @login_required
 @admin_required

From a0f4a0fdc778c976139b58b39fa11cb7b363477f Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexnadar@gmail.com>
Date: Sat, 12 Oct 2024 22:05:36 +0300
Subject: [PATCH 08/13] open_view_solution form reworked

---
 app/routes/user_submited_solutions.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/routes/user_submited_solutions.py b/app/routes/user_submited_solutions.py
index 300ca7b..f2ee2d8 100644
--- a/app/routes/user_submited_solutions.py
+++ b/app/routes/user_submited_solutions.py
@@ -1,5 +1,5 @@
 from flask import Blueprint, render_template, abort
-from flask_login import login_required
+from flask_login import login_required, current_user
 # Import models
 from app.models import SubmitedSolution
 
@@ -13,4 +13,9 @@ def open_view_solution(solution_id):
     user_solved_quest = SubmitedSolution.query.filter_by(submission_id=solution_id).first()
     if not user_solved_quest:
         return abort(404)
+    
+    # Check if the current user is the solution owner OR an admin
+    if user_solved_quest.user_id != current_user.user_id and current_user.user_role != 'Admin':
+        return abort(404)
+    
     return render_template('view_solution.html', user_solved_quest=user_solved_quest)
\ No newline at end of file

From b91b78776f922bf191d666521d5d43785ec52951 Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexandar@gmail.com>
Date: Sun, 13 Oct 2024 10:09:01 +0300
Subject: [PATCH 09/13] contact form rework

---
 app/forms.py         |  8 ++++----
 app/routes/routes.py | 36 ++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index bd9d7ea..39b075c 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -183,10 +183,10 @@ class PublishCommentForm(FlaskForm):
 
 ########### Contact Form ###########
 class ContactForm(FlaskForm):
-    username = StringField('Name', validators=[DataRequired(), Length(min=4, max=25)],)
-    email = StringField('Email address', validators=[DataRequired(), Email(), latin_characters_only])
-    subject = StringField('Subject', validators=[DataRequired(), Length(min=4, max=25)])
-    message = TextAreaField('Message', validators=[DataRequired(), Length(min=10)])
+    username = StringField('Name', validators=[DataRequired(message="Name is required"), Length(min=4, max=25, message="Name must be between 4 and 25 characters.")],)
+    email = StringField('Email address', validators=[DataRequired(message="Email address is required."), Email(message="Invalid email address."), latin_characters_only])
+    subject = StringField('Subject', validators=[DataRequired(message="Subject is required"), Length(min=4, max=25, message="Subject must be between 4 and 25 characters.")])
+    message = TextAreaField('Message', validators=[DataRequired(message="Message is required"), Length(min=10, max=500, message="Message must be between 10 and 500 characters.")])
     submit = SubmitField('Send Message')
     
 ########### User Profile Form - update user's profile ###########
diff --git a/app/routes/routes.py b/app/routes/routes.py
index dc7fa2a..b4a24af 100644
--- a/app/routes/routes.py
+++ b/app/routes/routes.py
@@ -49,7 +49,7 @@ def login():
     return render_template('index.html', form=form)
 
 # Route to handle the logout functionality
-@bp.route('/logout')
+@bp.route('/logout', methods=['POST'])
 @login_required
 def logout():
     user = current_user
@@ -61,7 +61,6 @@ def logout():
     flash('You have been logged out.', 'success')
     return redirect(url_for('main.login'))
 
-
 # Handle the registration route
 @bp.route('/register', methods=['GET', 'POST'])
 def register():
@@ -110,7 +109,6 @@ def register():
                     flash(f"{getattr(form, field).label.text} - {error}", 'error')
     return render_template('register.html', form=form)
 
-
 ########### Routes handling password reset functionality ###########
 # Route to open the forgot password form
 @bp.route('/forgot_password')
@@ -221,9 +219,9 @@ def update_new_password(form=None):
     # Pass necessary parameters to the template in case of errors
     return render_template('reset_password.html', form=form, token=form.token.data, user_id=form.user_id.data, username=form.username.data, expiration_time=form.expiration_time.data)
 
-########### Routes handling main apge ###########
+########### Routes handling main page ###########
 # Open the main page
-@bp.route('/home')
+@bp.route('/home', methods=['GET'])
 @login_required
 def main_page():
     user_count = User.query.count()
@@ -240,19 +238,19 @@ def main_page():
                            solutions_count=solutions_count)
 
 # Check the number of online users. Function used by the websockets and client side script.
-@bp.route('/get_online_users')
+@bp.route('/get_online_users', methods=['GET'])
 def get_online_users():
     online_users = User.query.filter_by(user_online_status='Online').count()
     return jsonify({'online_users': online_users})
 
 # Route to open the about page
-@bp.route('/about')
+@bp.route('/about', methods=['GET'])
 @login_required
 def about():
     return render_template('about.html')
 
 # Route to open the contact page
-@bp.route('/contact_us')
+@bp.route('/contact_us', methods=['GET'])
 @login_required
 def contact():
     contact_form = ContactForm()
@@ -264,15 +262,25 @@ def contact():
 @login_required
 def send_message():
     contact_form = ContactForm()
-    user = contact_form.username.data
-    email = contact_form.email.data
-    subject = contact_form.subject.data
-    message = contact_form.message.data
+    
     if contact_form.validate_on_submit():
+        # Extract data only after validation succeeds
+        user = contact_form.username.data
+        email = contact_form.email.data
+        subject = contact_form.subject.data
+        message = contact_form.message.data
+
+        # Call function to send the email
         send_contact_email(user, email, subject, message)
+
+        # Success feedback
         flash('Thank you for contacting us. We will get back to you as soon as possible.', 'success')
         return redirect(url_for('main.contact'))
+    
+    # Error handling if form is not valid
     flash('Error during sending the email.', 'error')
-    for error in contact_form.errors:
-        flash(f'{contact_form.errors[error][0]}', 'error')
+    for field, errors in contact_form.errors.items():
+        for error in errors:
+            flash(f'{field}: {error}', 'error')
+        
     return render_template('contact.html', form=contact_form)
\ No newline at end of file

From 8b8f611ec02b461f472d9859cd22d40fb8754a93 Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexandar@gmail.com>
Date: Sun, 13 Oct 2024 10:11:17 +0300
Subject: [PATCH 10/13] frontend contact form reworked

---
 app/static/css/contact.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/static/css/contact.css b/app/static/css/contact.css
index 7c2d585..5091560 100644
--- a/app/static/css/contact.css
+++ b/app/static/css/contact.css
@@ -48,19 +48,19 @@ body {
 }
 
 .description-image {
-    max-width: 200px;
+    max-width: 250px;
     margin-right: 20px !important;
 }
 .description-text {
     color: #d2d0d0;
 }
 .description-text h2 {
-    font-size: 16px;
+    font-size: 20px;
     /* margin-bottom: 10px; */
     color: #03e9f4;
 }
 .description-text p {
-    font-size: 14px;
+    font-size: 18px;
     line-height: 1.5;
 }
 

From 7b2634158ab3075416aa09b3058b0952ae53514c Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexandar@gmail.com>
Date: Sun, 13 Oct 2024 10:49:25 +0300
Subject: [PATCH 11/13] register form rework

---
 app/forms.py                | 12 ++++++------
 app/routes/routes.py        |  2 +-
 app/static/css/register.css | 15 ++++++++++++---
 app/templates/register.html | 28 ++++++++++++++--------------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 39b075c..a8baff9 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -48,12 +48,12 @@ class LoginForm(FlaskForm):
 
 ########### Register Form ###########
 class RegistrationForm(FlaskForm):
-    username = StringField('', render_kw={'placeholder': 'Username'}, validators=[DataRequired(), Length(min=4, max=25)])
-    first_name = StringField('', render_kw={'placeholder': 'First name'}, validators=[DataRequired(), Length(min=1, max=30)])
-    last_name = StringField('', render_kw={'placeholder': 'Last name'}, validators=[DataRequired(), Length(min=1, max=30)])
-    email = StringField('', render_kw={'placeholder': 'Email address'}, validators=[DataRequired(), Email(), latin_characters_only])   
+    username = StringField('', render_kw={'placeholder': 'Username'}, validators=[DataRequired(message="Username is required"), Length(min=4, max=25, message="Username must be between 4 and 25 characters.")])
+    first_name = StringField('', render_kw={'placeholder': 'First name'}, validators=[DataRequired(message="First name is required"), Length(min=1, max=30, message="First name must be between 1 and 30 characters.")])
+    last_name = StringField('', render_kw={'placeholder': 'Last name'}, validators=[DataRequired(message="Last name is required"), Length(min=1, max=30, message="Last name must be between 1 and 30 characters.")])
+    email = StringField('', render_kw={'placeholder': 'Email address'}, validators=[DataRequired(message="Email address is required"), Email(message="Invalid emal address"), latin_characters_only])   
     password = PasswordField('', validators=[
-        DataRequired(),
+        DataRequired(message="Password is required"),
         Length(min=10, max=50, message='Password must be between 10 and 50 characters.'),
         Regexp(re.compile(r'.*[A-Z].*'), message='Password must contain at least one uppercase letter.'),
         Regexp(re.compile(r'.*[0-9].*'), message='Password must contain at least one digit.'),
@@ -61,7 +61,7 @@ class RegistrationForm(FlaskForm):
     ],
         render_kw={'placeholder': 'Password'})
     confirm = PasswordField('', render_kw={'placeholder': 'Repeat password'}, validators=[
-        DataRequired(), 
+        DataRequired(message="Please confirm your password"), 
         EqualTo('password', message='Passwords must match'), 
         Length(min=10, max=50, message='Password must be between 10 and 50 characters.')
     ])
diff --git a/app/routes/routes.py b/app/routes/routes.py
index b4a24af..165cc34 100644
--- a/app/routes/routes.py
+++ b/app/routes/routes.py
@@ -49,7 +49,7 @@ def login():
     return render_template('index.html', form=form)
 
 # Route to handle the logout functionality
-@bp.route('/logout', methods=['POST'])
+@bp.route('/logout', methods=['GET', 'POST'])
 @login_required
 def logout():
     user = current_user
diff --git a/app/static/css/register.css b/app/static/css/register.css
index fd4c227..3319a9c 100644
--- a/app/static/css/register.css
+++ b/app/static/css/register.css
@@ -20,6 +20,7 @@ html {
     justify-content: center;
     align-items: center;
     background: linear-gradient(#141e30, #243b55) !important;
+    line-height: 0;
 }
 
 .alert {
@@ -61,20 +62,28 @@ html {
     text-align: center;
 }
 
+.container {
+    max-width: 100%
+}
+
 .login-box {
     display: flex;
     flex-direction: column;
     font-family: 'JetBrainsMonoRegular', sans-serif !important;
     color: #03e9f4;
-    padding: 40px;
+    margin: auto;
+    padding-left: 5%;
+    padding-right: 5%;
     background: rgba(0, 0, 0, .5);
     box-sizing: border-box;
     box-shadow: 0 15px 25px rgba(0, 0, 0, .6);
     border-radius: 10px;
-    margin-bottom: 20px;
-    /* Adjust margin as needed */
+    /* margin-bottom: 20px; */
 }
 
+
+
+
 .login-box p {
     margin-top: 20px;
     padding: 0;
diff --git a/app/templates/register.html b/app/templates/register.html
index e67301f..02a6d99 100644
--- a/app/templates/register.html
+++ b/app/templates/register.html
@@ -11,19 +11,19 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/register.css') }}">
 </head>
 <body>
-    <div class="container">
+    <div class="container max-w-100">
         <div class="row justify-content-center">
-            <div class="col-lg-6 col-md-8 col-sm-10">
+            <div class="col-lg-6 col-md-4 col-sm-10">
                 <div class="login-box">
                     <div class="user-box">
-                        <h2 style="font-family: 'JetBrainsMonoBold', sans-serif">Create new account</h2>
+                        <h2 class="mt-3" style="font-family: 'JetBrainsMonoBold', sans-serif">Create new account</h2>
                     </div>
                     
                     <div>
                         {% with messages = get_flashed_messages(with_categories=true) %}
                         {% if messages %}
                             {% for category, message in messages %}
-                                <div class="alert alert-{{ category }}">{{ message }}</div>
+                                <div class="alert alert-{{ category }} leading-5 gap-1">{{ message }}</div>
                             {% endfor %}
                         {% endif %}
                         {% endwith %}
@@ -55,15 +55,15 @@ <h2 style="font-family: 'JetBrainsMonoBold', sans-serif">Create new account</h2>
                             </div>
 
                             <!-- New div for password requirements -->
-                            <div class="user-box">
+                            <!-- <div class="user-box">
                                 <h3>Password Requirements:</h3>
-                                <ul>
-                                    <li>At least 10 characters long</li>
-                                    <li>Contains at least one uppercase letter</li>
-                                    <li>Contains at least one number</li>
-                                    <li>Contains at least one special character (e.g., @, #, $)</li>
+                                <ul class="flex flex-col w-100">
+                                    <li class="m-4">At least 10 characters long</li>
+                                    <li class="m-4">Contains at least one uppercase letter</li>
+                                    <li class="m-4">Contains at least one number</li>
+                                    <li class="m-4">Contains at least one special character (e.g., @, #, $)</li>
                                 </ul>
-                            </div>
+                            </div> -->
 
                             <div class="form-group user-box">
                                 <button type="submit" class="btn btn-primary btn-block">Submit</button>
@@ -71,9 +71,9 @@ <h3>Password Requirements:</h3>
                         </form>
                     </div>
                     <div class="user-box text-center">
-                        <p style="font-family: 'JetBrainsMonoBold', sans-serif">Already have an account?<br>
-                            <a href="{{ url_for('main.login') }}" style="color: #03e9f4; font-family: 'JetBrainsMonoBold', sans-serif">Login here</a>
-                        </p>
+                        <p style="font-family: 'JetBrainsMonoBold', sans-serif">Already have an account?</p>
+                        <a href="{{ url_for('main.login') }}" style="color: #03e9f4; font-family: 'JetBrainsMonoBold', sans-serif">Login here</a>
+                        
                     </div>
                 </div>
             </div>

From f63a5fcabde3d43f9611cbdbb6fee1aefd2958d0 Mon Sep 17 00:00:00 2001
From: ragnarok dev-station <karastoqnov.alexandar@gmail.com>
Date: Sun, 13 Oct 2024 10:56:28 +0300
Subject: [PATCH 12/13] patch 1.4.5 release prep

---
 Dockerfile | 4 ++--
 setup.cfg  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b366081..3b9eb9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,9 @@ FROM python:3.12.7
 
 # Image Labels. Update values for each build
 LABEL Name="Skill-Forge"
-LABEL Version="1.4.4"
+LABEL Version="1.4.5"
 LABEL Release="public"
-LABEL ReleaseDate="08.10.2024"
+LABEL ReleaseDate="13.10.2024"
 LABEL Description="Skill Forge is a open-source platform for learning and practicing programming languages."
 LABEL Maintainer="Aleksandar Karastoyanov <karastoqnov.alexadar@gmail.com>"
 LABEL License="GNU GPL v3.0 license"
diff --git a/setup.cfg b/setup.cfg
index d9785a1..d457e3f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = Skill-Forge
-version = 1.4.4
-release_date = 08.10.2024
+version = 1.4.5
+release_date = 13.10.2024
 description = Skill Forge is a open-source platform for learning and practicing programming languages.
 author = Aleksandar Karastoyanov
 author_email = karastoqnov.alexandar@gmail.com

From 892d4f0be3d06eea5a9e1d8bbfcf522dbf4d1d54 Mon Sep 17 00:00:00 2001
From: Aleksandar Karastoyanov <karastoqnov.alexandar@gmail.com>
Date: Sun, 13 Oct 2024 11:01:52 +0300
Subject: [PATCH 13/13] Fix code scanning alert no. 106: Code injection

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 app/routes/user_submit_quest_routes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/routes/user_submit_quest_routes.py b/app/routes/user_submit_quest_routes.py
index b34d240..cacbb54 100644
--- a/app/routes/user_submit_quest_routes.py
+++ b/app/routes/user_submit_quest_routes.py
@@ -1,4 +1,4 @@
-import random, string, base64
+import random, string, base64, json
 from datetime import datetime
 from flask import Blueprint, render_template, redirect, url_for, flash, current_app, request
 from flask_login import login_required, current_user
@@ -242,7 +242,7 @@ def approve_submited_quest(quest_id):
 @login_required
 def post_comment():
     submited_quest_id = request.form.get('submited_quest_id')
-    all_comments = eval(request.form.get('submited_quest_comments'))
+    all_comments = json.loads(request.form.get('submited_quest_comments'))
     comment = request.form.get('submited_quest_comment')
     user_id = current_user.user_id
     user_role = current_user.user_role