Merge pull request #107 from FSU-ACM/release

deployment + ui/ux updates

Author: mmcinnestaylor

Dockerfile

@@ -36,7 +36,7 @@ WORKDIR /app
 USER app_user:app_user
 
 COPY --chown=app_user:app_user src .
-COPY --chown=app_user:app_user deploy/prod/contestsuite/scripts/*.sh docker/
+COPY --chown=app_user:app_user scripts/docker/ docker/
 
 RUN chmod +x docker/*.sh
 

Pipfile.lock

@@ -41,6 +41,7 @@ services:
             - contestsuite_email_user
             - contestsuite_email_password
             - contestsuite_discord_guild_id
+            - contestsuite_gtag
         environment:
             # Django
             SECRET_KEY: /run/secrets/contestsuite_django_key # Project secret key
@@ -62,6 +63,9 @@ services:
 
             # Hashid Module 
             HASHID_FIELD_SALT: /run/secrets/contestsuite_hashid_key # Global Salt
+
+            # Analytics
+            GTAG: /run/secrets/contestsuite_gtag # Google site tag
         volumes:
             - django_app:/app/media
             - django_static:/app/static
@@ -331,6 +335,9 @@ secrets:
         external: true
     contestsuite_flower_cookie_key:
         external: true
+    # Analytics
+    contestsuite_gtag:
+        external: true
 volumes:
     django_app:
     django_db:

deploy/dev/scripts/celery/worker/runworker.sh

@@ -1,16 +1,16 @@
 -i https://pypi.python.org/simple
-astroid==2.14.1 ; python_full_version >= '3.7.2'
+astroid==2.14.2 ; python_full_version >= '3.7.2'
 autopep8==2.0.1
 dill==0.3.6 ; python_version < '3.11'
 isort==5.12.0 ; python_full_version >= '3.8.0'
 lazy-object-proxy==1.9.0 ; python_version >= '3.7'
 mccabe==0.7.0 ; python_version >= '3.6'
-platformdirs==2.6.2 ; python_version >= '3.7'
+platformdirs==3.0.0 ; python_version >= '3.7'
 pycodestyle==2.10.0 ; python_version >= '3.6'
-pylint==2.16.1
+pylint==2.16.2
 tomli==2.0.1 ; python_version < '3.11'
 tomlkit==0.11.6 ; python_version >= '3.6'
-typing-extensions==4.4.0 ; python_version >= '3.7'
+typing-extensions==4.5.0 ; python_version >= '3.7'
 wrapt==1.14.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 aiohttp==3.7.4.post0 ; python_version >= '3.6'
 amqp==5.1.1 ; python_version >= '3.6'
@@ -31,7 +31,7 @@ defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1,
 deprecated==1.2.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 diff-match-patch==20200713 ; python_version >= '2.7'
 discord.py==1.7.3
-django==4.1.6
+django==4.1.7
 django-celery-beat==2.4.0
 django-hashid-field==3.3.7
 django-import-export==3.0.2
@@ -40,15 +40,15 @@ et-xmlfile==1.1.0 ; python_version >= '3.6'
 flower==1.2.0
 gunicorn==20.1.0
 hashids==1.3.1 ; python_version >= '2.7'
-hiredis==2.2.1
+hiredis==2.2.2
 humanize==4.6.0 ; python_version >= '3.7'
 idna==3.4 ; python_version >= '3.5'
 kombu==5.2.4 ; python_version >= '3.7'
 markuppy==1.14
 multidict==6.0.4 ; python_version >= '3.7'
 mysqlclient==2.1.1
 odfpy==1.4.1
-openpyxl==3.1.0
+openpyxl==3.1.1
 packaging==23.0 ; python_version >= '3.7'
 prometheus-client==0.16.0 ; python_version >= '3.6'
 prompt-toolkit==3.0.36 ; python_full_version >= '3.6.2'
@@ -58,7 +58,7 @@ pytz==2022.7.1
 pyyaml==6.0
 redis==4.1.4
 requests==2.28.2
-setuptools==67.1.0 ; python_version >= '3.7'
+setuptools==67.3.2 ; python_version >= '3.7'
 six==1.16.0
 sqlparse==0.4.3 ; python_version >= '3.5'
 tablib[html,ods,xls,xlsx,yaml]==3.3.0 ; python_version >= '3.7'

deploy/dev/scripts/django/runserver.sh

@@ -18,7 +18,7 @@ defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1,
 deprecated==1.2.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 diff-match-patch==20200713 ; python_version >= '2.7'
 discord.py==1.7.3
-django==4.1.6
+django==4.1.7
 django-celery-beat==2.4.0
 django-hashid-field==3.3.7
 django-import-export==3.0.2
@@ -27,15 +27,15 @@ et-xmlfile==1.1.0 ; python_version >= '3.6'
 flower==1.2.0
 gunicorn==20.1.0
 hashids==1.3.1 ; python_version >= '2.7'
-hiredis==2.2.1
+hiredis==2.2.2
 humanize==4.6.0 ; python_version >= '3.7'
 idna==3.4 ; python_version >= '3.5'
 kombu==5.2.4 ; python_version >= '3.7'
 markuppy==1.14
 multidict==6.0.4 ; python_version >= '3.7'
 mysqlclient==2.1.1
 odfpy==1.4.1
-openpyxl==3.1.0
+openpyxl==3.1.1
 packaging==23.0 ; python_version >= '3.7'
 prometheus-client==0.16.0 ; python_version >= '3.6'
 prompt-toolkit==3.0.36 ; python_full_version >= '3.6.2'
@@ -45,12 +45,12 @@ pytz==2022.7.1
 pyyaml==6.0
 redis==4.1.4
 requests==2.28.2
-setuptools==67.1.0 ; python_version >= '3.7'
+setuptools==67.3.2 ; python_version >= '3.7'
 six==1.16.0
 sqlparse==0.4.3 ; python_version >= '3.5'
 tablib[html,ods,xls,xlsx,yaml]==3.3.0 ; python_version >= '3.7'
 tornado==6.2 ; python_version >= '3.7'
-typing-extensions==4.4.0 ; python_version >= '3.7'
+typing-extensions==4.5.0 ; python_version >= '3.7'
 tzdata==2022.7 ; python_version >= '2'
 urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 vine==5.0.0 ; python_version >= '3.6'

deploy/prod/contestsuite/docker-swarm.yaml

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export DEBUG=True
+exec celery -A ../../src/contestsuite worker -l INFO

requirements-dev.txt

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export DEBUG=True
+exec python3 ../../src/manage.py runserver localhost:8000

requirements.txt

@@ -9,7 +9,7 @@
 {% block section %}Announcements - {{ object.title }}{% endblock %}
 
 {% block content %}
-{% cache cache_timeout announcements announcement.slug %}
+{% cache CACHE_TIMEOUT announcements announcement.slug %}
   <div class="row justify-content-center">
     <div class="col">
       <div class="card mb-3 mt-3 shadow">

scripts/celery/worker/runworker.sh

@@ -11,10 +11,16 @@
 {% block content %}
 <h1 class="text-center">Contest Announcements</h1>
 
+<div class="row justify-content-center">
+    <div class="col-md-9 col-lg-8 mt-3">
+        <a href="{% url 'announcements_feed' %}" class="btn text-white" title="Announcements RSS feed"
+            style="background-color: #f3a871;"><i class="fa fa-rss fa-sm fa-fw"></i> Subscribe</a>
+    </div>
+</div>
 {% if is_paginated %}
-    {% cache cache_timeout announcements page_obj.number %}
+    {% cache CACHE_TIMEOUT announcements page_obj.number %}
         <div class="row justify-content-center">
-            <div class="col-md-8 mt-3 left">
+            <div class="col-md-9 col-lg-8 mt-3">
                 {% for announcement in object_list %}
                     <div class="card mb-4 shadow">
                         <div class="card-body">
@@ -56,9 +62,9 @@ <h3 class="card-title mb-0">{{ announcement.title }}</h3>
 
     {% endcache %}
 {% else %}
-    {% cache cache_timeout announcements %}
+    {% cache CACHE_TIMEOUT announcements %}
         <div class="row justify-content-center">
-            <div class="col-md-8 mt-3 left">
+            <div class="col-md-9 col-lg-8 mt-3">
                 {% for announcement in object_list %}
                     <div class="card mb-4 shadow">
                         <div class="card-body">

scripts/django/runserver.sh

@@ -4,7 +4,6 @@
 from django.views.generic.list import ListView
 
 from .models import Announcement
-from contestsuite.settings import CACHE_TIMEOUT
 
 # Create your views here.
 
@@ -17,7 +16,7 @@ class AnnouncementListView(ListView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['now'] = timezone.now()
-        context['cache_timeout'] = CACHE_TIMEOUT
+
         return context
 
     def get_queryset(self):
@@ -31,5 +30,5 @@ class AnnouncementDetailView(DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['now'] = timezone.now()
-        context['cache_timeout'] = CACHE_TIMEOUT
+        
         return context

deploy/prod/contestsuite/scripts/entrypoint.sh scripts/docker/entrypoint.sh

@@ -11,24 +11,31 @@ <h1 class="text-center">Volunteer Check-in</h1>
 {% include 'core/messages.html' %}
 <!-- End Messages -->
 <div class="row justify-content-center">
-    <form method="post" id="checkinForm">
-        {% csrf_token %}
-        {% for field in volunteer_form %}
-        <p>
-            <h5 class="mb-0">{{ field.label_tag }}</h5>
-            {{ field }}<br>
-            <small class="form-text text-muted">
-                {% for error in field.errors %}
-                <p class="text-monospace font-weight-lighter text-danger mb-0">-{{ error }}</p>
+    <form method="post">
+        <div class="card">
+            <div class="card-body">
+                {% csrf_token %}
+                {% for field in volunteer_form %}
+                <p>
+                    <h5 class="mb-0">{{ field.label_tag }}</h5>
+                    {{ field }}<br>
+                    <small class="form-text text-muted">
+                        {% for error in field.errors %}
+                        <p class="text-monospace font-weight-lighter text-danger mb-0">-{{ error }}</p>
+                        {% endfor %}
+                        {% if field.help_text %}
+                        {{ field.help_text }}
+                        {% endif %}
+                    </small>
+                </p>
                 {% endfor %}
-                {% if field.help_text %}
-                {{ field.help_text }}
-                {% endif %}
-            </small>
-        </p>
-        {% endfor %}
-        <button class="btn btn-sm btn-primary" type="submit">Submit</button>
-        <a class="btn btn-light btn-sm mx-1" href="{% url 'volunteer_checkin' %}" role="button">Refresh form</a>    
+            </div>
+            <div class="card-footer">
+                <button class="btn btn-sm btn-primary" type="submit">Submit</button>
+                <a class="btn btn-secondary btn-sm mx-1" href="{% url 'volunteer_checkin' %}" role="button">Refresh form</a>
+            </div>
+        </div>
+         
     </form>
 </div>
 

deploy/prod/contestsuite/scripts/start.sh scripts/docker/start.sh

@@ -2,6 +2,7 @@
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required, user_passes_test
+from django.core.cache import cache
 from django.db import transaction
 from django.shortcuts import render, redirect
 
@@ -11,6 +12,7 @@
 from . import tasks
 from .utils import checkin_auth
 from contestadmin.models import Contest
+from contestsuite.settings import CACHE_TIMEOUT
 from register.models import Team
 
 # Create your views here.
@@ -158,10 +160,8 @@ def volunteer_checkin(request):
 			except:
 				messages.error(request, 'Username not found', fail_silently=True)
 			else:
-				try:
-					contest = Contest.objects.first()
-				except:
-					contest = None
+				contest = cache.get_or_set(
+                                    'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
 
 				if contest is None:
 					messages.warning(request, 'Unable to verify PIN. Please try again later.', fail_silently=True)

src/announcements/templates/announcements/announcement_detail.html

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.6 on 2023-02-09 18:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contestadmin', '0005_contest_lfg_active'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='order_tshirt_url',
+            field=models.URLField(blank=True, null=True),
+        ),
+    ]

src/announcements/templates/announcements/announcement_list.html

@@ -28,6 +28,13 @@ class Contest(models.Model):
     participation = models.PositiveSmallIntegerField(choices=FORMAT, blank=True, null=True)
     lfg_active = models.BooleanField(default=False)
     lunch_form_url = models.URLField(blank=True, null=True)
+    order_tshirt_url = models.URLField(blank=True, null=True)
 
     def __str__(self):
         return ("Programming Contest on "+str(self.contest_date))
+
+    def get_participation(self):
+        if self.participation:
+            return self.FORMAT[self.participation - 1][1]
+        else:
+            return 'TBA'