Merge develop into master

src/apps/competitions/migrations/0034_auto_20230727_1147.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.17 on 2023-07-27 11:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0033_auto_20230617_1753'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='task',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='submissions', to='tasks.Task'),
+        ),
+    ]

src/apps/competitions/utils.py

@@ -8,7 +8,7 @@
 from competitions.models import Competition
 
 
-def get_popular_competitions(limit=3):
+def get_popular_competitions(limit=4):
     '''
     Function to return most popular competitions based on the amount of participants.
 
@@ -26,7 +26,7 @@ def get_popular_competitions(limit=3):
     return competitions[:limit]
 
 
-def get_featured_competitions(limit=3, excluded_competitions=None):
+def get_featured_competitions(limit=4, excluded_competitions=None):
     '''
     Function to return featured competitions if they are still open.
 

src/static/riot/competitions/detail/_registration.tag

@@ -43,7 +43,10 @@
     </div>
 
     <div if="{status}">
-        Your current status is: {_.startCase(status)}
+        <div class="ui yellow message">
+            <h3>Registration Status: {_.startCase(status)}</h3>
+            Your request to participate in this competition is waiting for an approval from the competition organizer
+        </div>
     </div>
 
     <div ref="terms_modal" class="ui modal">