Merge pull request #95 from Vauhtijuoksu/develop

Release: 2024 submission changes & Discord login

Author: Uular

.github/workflows/azure-deployment.yml

@@ -22,6 +22,9 @@ jobs:
         with:
           python-version: '3.9'
 
+      - name: Install compile dependencies
+        run: sudo apt-get install -y gettext
+
       - name: Create and start virtual environment
         run: |
           python -m venv venv
@@ -31,6 +34,8 @@ jobs:
         run: pip install -r requirements.txt
 
       # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+      - name: Compile translations
+        run: python manage.py compilemessages
 
       - name: Upload artifact for deployment jobs
         uses: actions/upload-artifact@v2

Pipfile

@@ -5,6 +5,7 @@ name = "pypi"
 
 [packages]
 Django = "~=3.2"
+django-cms = "~=3.11"
 django-filer = "*"
 djangocms-text-ckeditor = "*"
 djangocms-link = "*"
@@ -24,6 +25,7 @@ django-storages = {extras = ["azure"], version = "~=1.13"}
 python-dateutil = "*"
 requests-cache = "*"
 gunicorn = "*"
+django-allauth = "*"
 
 [requires]
 python_version = "3.9"

Pipfile.lock

@@ -3,6 +3,7 @@
 
 from .forms import SubmissionForm, PlayerForm
 from .models import Event, Submission, MarathonPlugin
+from .utils import get_player_info_for_user
 
 @plugin_pool.register_plugin
 class SubmissionListPlugin(CMSPluginBase):
@@ -36,8 +37,17 @@ def render(self, context, instance, placeholder):
         previous_data = context['request'].session.get('previous_form')
 
         form = SubmissionForm(previous_data)
-        player_form = PlayerForm(previous_data, prefix='player')
-
+        if previous_data:
+            player_form = PlayerForm(previous_data, prefix='player')
+        elif context['request'].user.is_authenticated:
+            print('got user')
+            player_info = get_player_info_for_user(context['request'].user)
+            player_form = PlayerForm(initial=player_info, prefix='player')
+            if player_info.get('discord'):
+                player_form.fields['discord'].disabled = True
+        else:
+            player_form = PlayerForm(prefix='player')
+        context['require_authentication'] = True
         context['form'] = form
         context['player_form'] = player_form
         context['event'] = instance.event

marathon/cms_plugins.py

@@ -58,4 +58,5 @@ class Meta:
         widgets = {
             'time_constraints': forms.Textarea(attrs=TEXTAREA_ATTRS),
             'description': forms.Textarea(attrs=TEXTAREA_ATTRS),
+            'priority': forms.NumberInput(attrs={'min': '1'}),
         }

marathon/forms.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.18 on 2024-01-18 17:31
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('marathon', '0006_submission_updates_2023'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='priority',
+            field=models.IntegerField(default=1, help_text='jos ehdotat useampaa peliä (1=mieluisin)', validators=[django.core.validators.MinValueValidator(1)], verbose_name='tärkeysjärjestys'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='console',
+            field=models.CharField(max_length=29, verbose_name='laite/konsoli, jolla pelaat'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='estimate',
+            field=models.CharField(help_text='Arvioi suorituksen kestolle yläraja (tunnit:minuutit) alusta loppuun. Ota arviossa huomioon terveisten lähettämiset ja mahdolliset virheet runissa.', max_length=20, verbose_name='aika-arvio'),
+        ),
+    ]

marathon/migrations/0007_auto_20240118_1931.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.18 on 2024-01-22 19:00
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('marathon', '0007_auto_20240118_1931'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='priority',
+            field=models.IntegerField(default=1, help_text='Jos ehdotat useampaa peliä (1=mieluisin)', validators=[django.core.validators.MinValueValidator(1)], verbose_name='tärkeysjärjestys'),
+        ),
+    ]

marathon/migrations/0008_alter_submission_priority.py

@@ -1,11 +1,10 @@
 from cms.models import CMSPlugin
 from django.db import models
 from django.conf import settings
-from django.core.validators import RegexValidator
+from django.core.validators import MinValueValidator
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
-discord_validator = RegexValidator(r'^.{3,32}#[0-9]{4}$', _('Anna discord-tunnus muodossa <nimi>#<sarjanumero>'))
 
 class Player(models.Model):
     user = models.OneToOneField(
@@ -15,7 +14,7 @@ class Player(models.Model):
     )
 
     nickname = models.CharField(_('nimimerkki'), max_length=30)
-    discord = models.CharField(_('discord-tunnus'), max_length=50, validators=[discord_validator])
+    discord = models.CharField(_('discord-tunnus'), max_length=50)
     twitch = models.CharField(_('twitch-tunnus'), max_length=50, blank=True)
     gmail = models.EmailField(
         _('sähköpostiosoite'),
@@ -81,6 +80,13 @@ class Submission(models.Model):
     # Mandatory
     gdpr = models.BooleanField(default=False)
 
+    priority = models.IntegerField(
+        _('tärkeysjärjestys'),
+        help_text=_('Jos ehdotat useampaa peliä (1=mieluisin)'),
+        default=1,
+        validators=[MinValueValidator(1)],
+    )
+
     # Meta
     hidden = models.BooleanField(default=False)
 

marathon/models.py

@@ -0,0 +1,38 @@
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.forms.models import model_to_dict
+from allauth.account.models import EmailAddress
+from .models import Player
+
+
+def get_user_discord(user: settings.AUTH_USER_MODEL):
+    if hasattr(user, 'socialaccount_set'):
+        for account in user.socialaccount_set.all():
+            if account.provider == 'discord':
+                username = account.extra_data.get('username', None)
+                nickname = account.extra_data.get('global_name', None)
+                return {
+                    'discord': username,
+                    'nickname': nickname
+                }
+    return None
+
+def get_user_primary_email(user: settings.AUTH_USER_MODEL):
+    return EmailAddress.objects.get_primary_email(user)
+
+def get_player_info_for_user(user: settings.AUTH_USER_MODEL):
+    try:
+        player = user.player
+        return model_to_dict(player)
+    except ObjectDoesNotExist:
+        pass
+
+    player_info = {}
+
+    discord_info = get_user_discord(user) or {}
+    player_info.update(discord_info)
+    
+    email = get_user_primary_email(user)
+    player_info['gmail'] = email
+
+    return player_info

marathon/utils.py

@@ -25,7 +25,12 @@ def event_detail(request, event):
 def new_submission(request, event):
     if request.method == 'POST':
         event = get_object_or_404(Event, slug=event)
-        player_form = PlayerForm(request.POST, prefix='player')
+
+        player = None
+        if request.user.is_authenticated:
+            player, created = Player.objects.get_or_create(user=request.user)
+        player_form = PlayerForm(request.POST, prefix='player', instance=player)
+
         form = SubmissionForm(request.POST)
 
         if form.is_valid() and player_form.is_valid():

marathon/views.py

@@ -1,69 +1,72 @@
 -i https://pypi.org/simple
-asgiref==3.6.0 ; python_version >= '3.7'
-attrs==22.2.0 ; python_version >= '3.6'
-azure-core==1.26.3 ; python_version >= '3.7'
-azure-storage-blob==12.15.0
-beautifulsoup4==4.12.0 ; python_full_version >= '3.6.0'
-brotli==1.0.9
-cattrs==22.2.0 ; python_version >= '3.7'
-certifi==2022.12.7 ; python_version >= '3.6'
-cffi==1.15.1
-charset-normalizer==3.1.0 ; python_full_version >= '3.7.0'
-cryptography==40.0.1 ; python_version >= '3.6'
+asgiref==3.7.2 ; python_version >= '3.7'
+attrs==23.2.0 ; python_version >= '3.7'
+azure-core==1.29.7 ; python_version >= '3.7'
+azure-storage-blob==12.19.0
+beautifulsoup4==4.12.3 ; python_full_version >= '3.6.0'
+brotli==1.1.0
+cattrs==23.2.3 ; python_version >= '3.8'
+certifi==2023.11.17 ; python_version >= '3.6'
+cffi==1.16.0 ; python_version >= '3.8'
+chardet==5.2.0 ; python_version >= '3.7'
+charset-normalizer==3.3.2 ; python_full_version >= '3.7.0'
+cryptography==41.0.7 ; python_version >= '3.7'
 cssselect2==0.7.0 ; python_version >= '3.7'
-django==3.2.18
-django-appconf==1.0.5 ; python_version >= '3.6'
+defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+django==3.2.23
+django-allauth==0.60.1
+django-appconf==1.0.6 ; python_version >= '3.7'
 django-bootstrap-v5==1.0.11
-django-classy-tags==4.0.0 ; python_version >= '3.7'
-django-cms==3.11.1 ; python_version >= '3.7'
-django-compressor==4.3.1
-django-filer==2.2.4
-django-formtools==2.4 ; python_version >= '3.6'
-django-js-asset==2.0.0 ; python_version >= '3.6'
-django-mptt==0.14.0 ; python_version >= '3.6'
+django-classy-tags==4.1.0 ; python_version >= '3.8'
+django-cms==3.11.4
+django-compressor==4.4
+django-filer==3.1.1
+django-formtools==2.5.1 ; python_version >= '3.8'
 django-polymorphic==3.1.0
 django-sass-processor==1.1
-django-sekizai==4.0.0 ; python_version >= '3.8'
-django-storages[azure]==1.13.2
-django-treebeard==4.4 ; python_version >= '3.6'
-djangocms-admin-style==3.2.3 ; python_version >= '3.7'
-djangocms-attributes-field==2.1.0
-djangocms-file==3.0.0
+django-sekizai==4.1.0 ; python_version >= '3.8'
+django-storages[azure]==1.14.2
+django-treebeard==4.7 ; python_version >= '3.8'
+djangocms-admin-style==3.2.7 ; python_version >= '3.7'
+djangocms-attributes-field==3.0.0
+djangocms-file==3.0.1
 djangocms-link==3.1.1
-djangocms-picture==4.0.0
-djangocms-snippet==3.1.0
-djangocms-style==3.0.0
-djangocms-text-ckeditor==5.1.2
+djangocms-picture==4.1.1
+djangocms-snippet==3.1.1
+djangocms-style==3.1.0
+djangocms-text-ckeditor==5.1.5
 easy-thumbnails[svg]==2.8.5 ; python_version >= '3.6'
-exceptiongroup==1.1.1 ; python_version < '3.11'
-gunicorn==20.1.0
+exceptiongroup==1.2.0 ; python_version < '3.11'
+gunicorn==21.2.0
 html5lib==1.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-idna==3.4 ; python_version >= '3.5'
+idna==3.6 ; python_version >= '3.5'
 isodate==0.6.1
-libsass==0.22.0
-lxml==4.9.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-packaging==23.0 ; python_version >= '3.7'
-pillow==9.4.0 ; python_version >= '3.7'
-platformdirs==3.2.0 ; python_version >= '3.7'
-psycopg2==2.9.5
+libsass==0.23.0
+lxml==5.1.0 ; python_version >= '3.6'
+oauthlib==3.2.2 ; python_version >= '3.6'
+packaging==23.2 ; python_version >= '3.7'
+pillow==10.2.0 ; python_version >= '3.8'
+platformdirs==4.1.0 ; python_version >= '3.8'
+psycopg2==2.9.9
 pycparser==2.21 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pyjwt[crypto]==2.8.0 ; python_version >= '3.7'
 python-dateutil==2.8.2
 python-decouple==3.8
-pytz==2023.3
+python3-openid==3.2.0
+pytz==2023.3.post1
 rcssmin==1.1.1
-reportlab==3.6.12 ; python_version >= '3.7' and python_version < '4.0'
-requests==2.28.2
-requests-cache==1.0.1
+reportlab==4.0.9 ; python_version >= '3.7' and python_version < '4.0'
+requests==2.31.0
+requests-cache==1.1.1
+requests-oauthlib==1.3.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 rjsmin==1.2.1
-setuptools==67.6.1 ; python_version >= '3.7'
 six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-soupsieve==2.4 ; python_version >= '3.7'
-sqlparse==0.4.3 ; python_version >= '3.5'
+soupsieve==2.5 ; python_version >= '3.8'
+sqlparse==0.4.4 ; python_version >= '3.5'
 svglib==1.5.1 ; python_version >= '3.7'
 tinycss2==1.2.1 ; python_version >= '3.7'
-typing-extensions==4.5.0 ; python_version >= '3.7'
-unidecode==1.1.2
+typing-extensions==4.9.0 ; python_version < '3.11'
 url-normalize==1.4.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-urllib3==1.26.15 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+urllib3==2.1.0 ; python_version >= '3.8'
 webencodings==0.5.1
-whitenoise[brotli]==6.4.0
+whitenoise[brotli]==6.6.0

requirements.txt

@@ -9,6 +9,7 @@ done
 
 echo "PostgreSQL started"
 
+python manage.py compilemessages
 python manage.py compilescss --use-storage
 python manage.py collectstatic --noinput --ignore=*.scss
 

scripts/docker_entrypoint_gunicorn.sh

@@ -0,0 +1,12 @@
+{% load allauth %}
+{% comment %} djlint:off {% endcomment %}
+<{% if attrs.href %}a href="{{ attrs.href }}"{% else %}button{% endif %}
+class="btn {% if attrs.classes %}{{ attrs.classes }}{% else %}btn-primary{% endif %}"
+{% if attrs.form %}form="{{ attrs.form }}"{% endif %}
+{% if attrs.id %}id="{{ attrs.id }}"{% endif %}
+{% if attrs.name %}name="{{ attrs.name }}"{% endif %}
+{% if attrs.type %}type="{{ attrs.type }}"{% endif %}
+>
+{% slot %}
+{% endslot %}
+</{% if attrs.href %}a{% else %}button{% endif %}>

templates/allauth/elements/button.html

@@ -0,0 +1,25 @@
+{% extends "vauhtijuoksu/vauhtijuoksu.html" %}
+{% load i18n %}
+{% block override %}
+    {% if messages %}
+        <div>
+            <strong>{% trans "Messages:" %}</strong>
+            <ul>
+                {% for message in messages %}<li>{{ message }}</li>{% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+    <div>
+        <ul>
+            {% if user.is_authenticated %}
+                <li>
+                    <a href="{% url 'account_logout' %}">{% trans "Sign Out" %}</a>
+                </li>
+            {% endif %}
+        </ul>
+    </div>
+    {% block content %}
+    {% endblock content %}
+{% endblock override %}
+{% block extra_body %}
+{% endblock extra_body %}