Merged master

Author: Casassarnau

.gitignore

@@ -14,3 +14,5 @@ staticfiles/
 
 /db/*
 !db/.keep
+
+/tmp/

app/settings.py

@@ -72,6 +72,7 @@
     'friends',
     'event',
     'event.messages',
+    'event.meals',
 ]
 
 MIDDLEWARE = [
@@ -393,6 +394,7 @@
 # Content-Security-Policy
 CSP_DEFAULT_SRC = ["'self'", "www.w3.org", "data:", "cdn.jsdelivr.net", "cdnjs.cloudflare.com"]
 CSP_FRAME_SRC = ['www.google.com']
+CSP_WORKER_SRC = ['blob:']
 CSP_SCRIPT_SRC = ["'self'", "cdn.jsdelivr.net", "cdnjs.cloudflare.com", "code.jquery.com", "d3js.org",
                   "www.google.com", "www.gstatic.com", "'unsafe-inline'"]
 CSP_STYLE_SRC = ["'self'", "'unsafe-inline'", "cdnjs.cloudflare.com", "cdn.jsdelivr.net"]

app/static/js/scanner.js

@@ -74,7 +74,6 @@ function Scanner(videoId, scanFunction=null, extraOpts={}) {
 }
 
 Scanner.prototype.start = function () {
-    console.log(this)
     this.scanner.hasFlash().then((response) => {
         let flash = $('#toggle-flash')
         if (response) flash.show()

app/static/js/toasts.js

@@ -0,0 +1,42 @@
+let ToastManager = {
+    add_toast: function (message, type, delay=null) {
+        let toast = $(
+            `<div class="toast align-items-center fade show bg-${type}" role="alert" aria-live="assertive" aria-atomic="true">
+                <div class="d-flex">
+                    <div class="toast-body">${message}</div>
+                    <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+                </div>
+            </div>`
+        )
+        $('#toasts').append(toast)
+        if (delay !== null) {
+            setTimeout(this.clear, delay, toast.get(0));
+        }
+    },
+    success: function (message, delay=null) {
+        this.add_toast(message, 'success', delay)
+    },
+    info: function (message, delay=null) {
+        this.add_toast(message, 'info', delay)
+    },
+    warning: function (message, delay=null) {
+        this.add_toast(message, 'warning', delay)
+    },
+    error: function (message, delay=null) {
+        this.add_toast(message, 'danger', delay)
+    },
+    primary: function (message, delay=null) {
+        this.add_toast(message, 'primary', delay)
+    },
+    secondary: function (message, delay=null) {
+        this.add_toast(message, 'secondary', delay)
+    },
+    clear: function (item) {
+        bootstrap.Toast.getOrCreateInstance(item).hide()
+    },
+    clearAll: function () {
+        $('#toasts > div').each((_, item) => {
+            this.clear(item)
+        })
+    }
+}

app/template.py

@@ -38,6 +38,8 @@ def get_main_nav(request):
         nav.append(('Checkin', reverse('checkin_list')))
         if is_installed('event.messages') and request.user.has_perm('event_messages.view_announcement'):
             nav.append(('Announcements', reverse('announcement_list')))
+        if is_installed('event.meals') and request.user.has_perm('meals.can_checkin_meals'):
+            nav.append(('Meals', reverse('meals_list')))
     if request.user.is_organizer():
         nav.extend([('Stats', reverse('stats_home'))])
     return nav

app/templates/components/bootstrap5_form.html

@@ -206,6 +206,7 @@
                                     field.fadeIn()
                                 } else {
                                     field.fadeOut()
+                                    field.find('input,textarea,select').val('')
                                 }
                             })
                             if (!{{ values|safe }}.includes(objectifyForm(form)['{{ cond_field_name }}'])) {

app/templates/components/imports.html

@@ -35,3 +35,6 @@
 
 <!-- Our WebPage style -->
 <link href="{% static 'css/main.css' %}" rel="stylesheet">
+
+<!-- ToastManager -->
+<script src="{% static 'js/toasts.js' %}"></script>

app/templates/components/toast.html

@@ -1,12 +1,10 @@
-{% if messages %}
-    <div class="position-fixed bottom-0 end-0 p-3" style="z-index: 11">
-        {% for message in messages %}
-            <div class="toast align-items-center show bg-{{ message.tags }}" role="alert" aria-live="assertive" aria-atomic="true">
-                <div class="d-flex">
-                    <div class="toast-body">{{ message|capfirst }}</div>
-                    <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
-                </div>
+<div id="toasts" class="position-fixed bottom-0 end-0 p-3" style="z-index: 11">
+    {% for message in messages %}
+        <div class="toast align-items-center fade show bg-{{ message.tags }}" role="alert" aria-live="assertive" aria-atomic="true">
+            <div class="d-flex">
+                <div class="toast-body">{{ message|capfirst }}</div>
+                <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
             </div>
-        {% endfor %}
-    </div>
-{% endif %}
+        </div>
+    {% endfor %}
+</div>

application/forms/mentor.py

@@ -32,7 +32,7 @@ class MentorForm(ApplicationForm):
     study_work = forms.TypedChoiceField(
         required=True,
         label='Are you studying or working?',
-        choices=(('Study', _('Study')), ('Study', _('Work'))),
+        choices=(('Study', _('Study')), ('Work', _('Work'))),
         widget=forms.RadioSelect(attrs={'class': 'inline'})
     )
 

application/migrations/0030_draftapplication.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.8 on 2022-12-29 12:07
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('application', '0029_applicationtypeconfig_spots'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DraftApplication',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('data', models.TextField(blank=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]