Version 1.3.14 deployment

Dockerfile

@@ -3,9 +3,9 @@ FROM karastoyanov/skill-forge-baseimage
 
 # Image Labels. Update values for each build
 LABEL Name="Skill-Forge"
-LABEL Version=1.3.13
+LABEL Version=1.3.14
 LABEL Release="pre-release"
-LABEL ReleaseDate="28.07.2024"
+LABEL ReleaseDate="04.08.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"

app/__init__.py

@@ -1,5 +1,5 @@
 
-from flask import Flask, redirect, url_for, render_template, flash, jsonify
+from flask import Flask, redirect, url_for, render_template, flash, jsonify, send_file
 from config import Config
 from flask_migrate import Migrate
 from flask_bcrypt import Bcrypt
@@ -13,7 +13,7 @@
 from app.models import User
 # Import scheduler
 from apscheduler.schedulers.background import BackgroundScheduler
-import atexit
+import atexit, base64, io
 
 migrate = Migrate()
 bcrypt = Bcrypt()
@@ -37,12 +37,13 @@ def create_app():
     app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_port=1, x_prefix=1)
 
     # Import routes
-    from app.routes import routes, user_routes, user_submited_solutions, quests_routes, user_submit_quest_routes
+    from app.routes import routes, user_routes, user_submited_solutions, quests_routes, user_submit_quest_routes, guild_routes
     app.register_blueprint(routes.bp)
     app.register_blueprint(user_routes.bp_usr)
     app.register_blueprint(user_submit_quest_routes.bp_usq)
     app.register_blueprint(user_submited_solutions.bp_uss)
     app.register_blueprint(quests_routes.bp_qst)
+    app.register_blueprint(guild_routes.bp_guild)
 
     # Import websockets
     # Define ping timeout and ping interval (in seconds)

app/forms.py

@@ -190,6 +190,7 @@ class ContactForm(FlaskForm):
 
 ########### User Profile Form - update user's profile ###########
 class UserProfileForm(FlaskForm):
+    about_me = TextAreaField('About Me', validators=[Optional()])
     first_name = StringField('First Name', validators=[Optional()])
     last_name = StringField('Last Name', validators=[Optional()])
     email = StringField('Email', validators=[Optional(), Email(), latin_characters_only])
@@ -199,9 +200,8 @@ class UserProfileForm(FlaskForm):
     discord_id = StringField('Discord ID', validators=[Optional()])
     linked_in = StringField('LinkedIn', validators=[Optional()])
     avatar = FileField('Upload Avatar', name="update_avatar", validators=[Optional()])
-    submit = SubmitField('Save Changes', name="submit")
+    submit = SubmitField('Update Profile', name="submit")
 
-
 ########### Submit Quest Form - as a Regular User ###########
 class QuestSubmissionForm(FlaskForm):
     quest_name = StringField('Quest Name', validators=[DataRequired(), Length(max=100)])
@@ -239,4 +239,11 @@ class QuestApprovalForm(FlaskForm):
     approve = SubmitField('Approve Quest', render_kw={'value': 'approve'})
     request_changes = SubmitField('Request Changes', render_kw={'value': 'request-changes'})
     reject = SubmitField('Reject Quest', render_kw={'value': 'reject'})
-    save_changes = SubmitField('Save Changes', render_kw={'value': 'save-changes'})
+    save_changes = SubmitField('Save Changes', render_kw={'value': 'save-changes'})
+
+########### Create New Guild Form ###########
+class CreateGuildForm(FlaskForm):
+    name = StringField('Guild Name', validators=[DataRequired(), Length(min=5, max=50)])
+    description = TextAreaField('Description', validators=[Optional(), Length(min=10, max=500)])
+    avatar = FileField('Avatar')
+    submit = SubmitField('Create Guild')

app/models.py

@@ -41,16 +41,20 @@ class User(UserMixin, db.Model):
     github_profile = db.Column(db.String(120), default="")
     discord_id = db.Column(db.String(120), default="")
     linked_in = db.Column(db.String(120), default="")
+    about_me = db.Column(db.Text, default="", nullable=True)
     is_banned = db.Column(db.Boolean, default=lambda: False)
     ban_date = db.Column(db.DateTime, nullable=True)
     ban_reason = db.Column(db.String(120), default=" ", nullable=True)
     user_online_status = db.Column(db.String(10), default="Offline", nullable=True)
     last_status_update = db.Column(db.DateTime, default=datetime.now(), nullable=True)
+    guild_id = db.Column(db.String(20), db.ForeignKey('guilds.guild_id'), nullable=True)
 
     # Define the relationship with the UserAchievement model
     achievements = db.relationship('UserAchievement')
     # Define the relationship with the Comment model
     comments = db.relationship('Comment', back_populates='user')
+    # Define the relationship with the Guild model
+    guild = db.relationship('Guild', back_populates='members', foreign_keys=[guild_id])
 
     def __init__(self, username, first_name, last_name, password, email, avatar=None):
         self.username = username
@@ -224,3 +228,22 @@ class SubmitedSolution(db.Model):
 
     # Define the relationship between the user_submited_solutions and coding_quests table.
     coding_quest = db.relationship('Quest')
+
+########### Define the Guild model ###########
+class Guild(db.Model):
+    __tablename__ = 'guilds'
+    guild_id = db.Column(db.String(20), primary_key=True, nullable=False)
+    guild_name = db.Column(db.String(100), unique=True, nullable=False)
+    guild_avatar = db.Column(db.LargeBinary, default=None)
+    description = db.Column(db.String(200), nullable=True)
+    guild_master_id = db.Column(db.String(20), db.ForeignKey('users.user_id'), nullable=False)
+    points = db.Column(db.Integer, default=0)
+    level = db.Column(db.Integer, default=1)
+    dungeons_completed = db.Column(db.Integer, default=0)
+    date_created = db.Column(db.DateTime, default=datetime.now(), nullable=False)
+    guild_members_count = db.Column(db.Integer, default=1)
+
+    # Define the relationship between the Guild model and the User model
+    members = db.relationship('User', back_populates='guild', foreign_keys=[User.guild_id])
+    # Define the relationship with the User model for guild master
+    guild_master = db.relationship('User', foreign_keys=[guild_master_id])

app/routes/__init__.py

@@ -13,4 +13,7 @@
 from .user_routes import bp_usr
 
 # Import routes from user submited solutions routes
-from .user_submited_solutions import bp_uss
+from .user_submited_solutions import bp_uss
+
+# Import routes from guild routes
+from .guild_routes import bp_guild

app/routes/guild_routes.py

@@ -0,0 +1,100 @@
+import random, string, base64, json, os
+from datetime import datetime
+from flask import Blueprint, redirect, url_for, request, render_template, jsonify, flash, abort, send_file
+from flask_login import login_required, current_user
+# Import the forms and models
+from app.models import Guild
+from app.forms import CreateGuildForm
+# Import code runners
+from app.code_runners import run_python, run_javascript, run_java, run_csharp
+# Import the database instance
+from app.database.db_init import db
+from sqlalchemy.orm import joinedload
+# Import MongoDB transactions functions
+from app.database.mongodb_transactions import mongo_transaction
+# Import admin_required decorator
+from app.user_permission import admin_required
+import io
+import base64
+
+bp_guild = Blueprint('guilds', __name__)
+
+# Redirect to create new guild page
+@bp_guild.route('/create_guild', methods=['GET'])
+def open_create_guild():
+    form = CreateGuildForm()
+    return render_template('guild_templates/create_guild.html', form=form)
+
+# Redirect to the guilds list page
+@bp_guild.route('/guilds', methods=['GET'])
+def open_guilds_list():
+    guilds = Guild.query.all()
+    return render_template('guild_templates/guilds_list.html', guilds=guilds)
+
+# Handle the guild avatar image requests
+@bp_guild.route('/guilds/avatar/<guild_id>')
+def get_guild_avatar(guild_id):
+    guild = Guild.query.filter_by(guild_id=guild_id).first_or_404()
+    if guild.guild_avatar:
+        img_data = guild.guild_avatar
+    else:
+        # Return a default image if no avatar is set
+        with open('app/static/images/default-guild-avatar.png', 'rb') as f:
+            img_data = f.read()
+    return send_file(io.BytesIO(img_data), mimetype='image/jpeg')
+
+# Create new guild
+@bp_guild.route('/guilds/create', methods=['GET', 'POST'])
+@login_required
+def create_new_guild():
+    form = CreateGuildForm()
+    if form.validate_on_submit():
+        existing_guild = Guild.query.filter_by(guild_name=form.name.data).first()
+        if existing_guild:
+            flash('This guild name is already taken. Please choose a different name.', 'error')
+            return render_template('create_guild.html', form=form)
+
+        if form.avatar.data:
+            guild_avatar = form.avatar.data.read()
+        else:
+            with open('app/static/images/default-guild-avatar.png', 'rb') as f:
+                guild_avatar = f.read()
+
+        # Generate a random guild ID
+        while True:
+            # Generate a random 7-digit number
+            random_digits = random.randint(1000000, 9999999)
+            guild_id = f"GD-{random_digits}"
+            # Check if this ID already exists in the database
+            existing_guild = Guild.query.filter_by(guild_id=guild_id).first()
+            if not existing_guild:
+                break
+
+
+        # Create new guild
+        guild = Guild(
+            guild_id=guild_id,
+            guild_name=form.name.data,
+            description=form.description.data,
+            guild_master_id=current_user.user_id,
+            guild_avatar=guild_avatar)
+
+        db.session.add(guild)
+        db.session.commit()
+
+        mongo_transaction(
+            'guild_create',
+            action=f'Guild {form.name.data} created by {current_user.username}',
+            user_id=current_user.user_id,
+            username=current_user.username,
+            timestamp=datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        )
+        flash(f'Guild {form.name.data} created successfully!', 'success')
+        return redirect(url_for('guilds.create_new_guild'))
+    else:
+        # Print form errors as flash messages
+        for field, errors in form.errors.items():
+            for error in errors:
+                flash(f"Error in the {getattr(form, field).label.text} field - {error}", 'error')
+
+    return render_template('guild_templates/create_guild.html', form=form)

app/routes/quests_routes.py

@@ -14,7 +14,6 @@
 from app.database.mongodb_transactions import mongo_transaction
 # Import admin_required decorator
 from app.user_permission import admin_required
-import logging
 
 
 bp_qst = Blueprint('quests', __name__)

app/routes/user_routes.py

@@ -25,6 +25,7 @@ def open_user_profile():
 
     if form.validate_on_submit():
         if 'submit' in request.form:
+            user.about_me = form.about_me.data
             user.first_name = form.first_name.data
             user.last_name = form.last_name.data
             user.email = form.email.data
@@ -61,6 +62,7 @@ def open_user_profile():
                 return redirect(url_for('usr.open_user_profile'))
 
     if request.method == 'GET':
+        form.about_me.data = user.about_me
         form.first_name.data = user.first_name
         form.last_name.data = user.last_name
         form.email.data = user.email
@@ -130,7 +132,6 @@ def edit_user_db():
     db.session.commit()
     return redirect(url_for('usr.open_admin_panel'))
 
-
 # Route to handle the user profile (self-open)
 @bp_usr.route('/user_profile/<username>', methods=['GET'])
 @login_required
@@ -173,7 +174,6 @@ def open_user_profile_view(username):
             # Handle the case where the user is not found
             return abort(404)
 
-
 # Redirect to the Admin Panel (Admin Role in the database is needed)
 @bp_usr.route('/admin_panel')
 @login_required