From a57e3863470cde60eba0537488558aaf5c183007 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Fri, 15 Sep 2023 01:07:49 +0200 Subject: [PATCH 01/15] Tickets: Add admin tickets stats view --- tickets/views/tickets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tickets/views/tickets.py b/tickets/views/tickets.py index 4e82ded1..4792f7fa 100644 --- a/tickets/views/tickets.py +++ b/tickets/views/tickets.py @@ -1,4 +1,5 @@ import logging +from datetime import datetime from django import urls from django.contrib import messages -- 2.30.2 From 0312194bd15b9b0503642b7fc04c7bd962a80f33 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Fri, 22 Sep 2023 01:41:40 +0200 Subject: [PATCH 02/15] Add Sponsor management It's now possible to add Sponsors to an Edition. Sponsors are added to the template context as 'edition_sponsors' as a dictionary sorted by SponsorLevel order. --- .../templates/flatpages/default_with_header.pug | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conference_main/templates/flatpages/default_with_header.pug b/conference_main/templates/flatpages/default_with_header.pug index ae9f7693..021bbce4 100644 --- a/conference_main/templates/flatpages/default_with_header.pug +++ b/conference_main/templates/flatpages/default_with_header.pug @@ -10,4 +10,11 @@ a.whoosh.whoosh-page(href="{% url 'admin:flatpages_flatpage_change' flatpage.id | {% block content_main %} .flatpage | {{ flatpage.content }} + +| {% for level, sponsors in edition_sponsors.items %} +| {{ level }} +| {% for sponsor in sponsors%} +img(src="{{ sponsor.logo.url }}") +| {% endfor %} +| {% endfor %} | {% endblock content_main %} -- 2.30.2 From fe46185b68194031def56500695d6fd66008c55c Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 22 Sep 2023 12:49:09 +0200 Subject: [PATCH 03/15] Sponsors: styling --- .../templates/flatpages/default_with_header.pug | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conference_main/templates/flatpages/default_with_header.pug b/conference_main/templates/flatpages/default_with_header.pug index 021bbce4..0c571928 100644 --- a/conference_main/templates/flatpages/default_with_header.pug +++ b/conference_main/templates/flatpages/default_with_header.pug @@ -11,10 +11,8 @@ a.whoosh.whoosh-page(href="{% url 'admin:flatpages_flatpage_change' flatpage.id .flatpage | {{ flatpage.content }} -| {% for level, sponsors in edition_sponsors.items %} -| {{ level }} -| {% for sponsor in sponsors%} -img(src="{{ sponsor.logo.url }}") -| {% endfor %} -| {% endfor %} | {% endblock content_main %} + +| {% block site_footer %} +| {% include "conference_main/components/sponsors.pug" %} +| {% endblock site_footer %} -- 2.30.2 From 964a53b79a870c9102280b4b163ce903c99fa00a Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 20:33:10 -0500 Subject: [PATCH 04/15] Try updating requirements.txt by removing tweepy --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index d520d542..150c8875 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit d520d54265caa675b68127aeabd474df8ed3fdfe +Subproject commit 150c8875e119eaf638e7d6a7a6f22b50b13c6c3a -- 2.30.2 From e04a607524a43a0f52e63f6d64b3718a3832e7f4 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 21:04:04 -0500 Subject: [PATCH 05/15] Revert to Poetrys versions --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6c5c90e8..141f35c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ aiosignal==1.2.0 asgiref==3.5.2 async-timeout==4.0.2 attrs==22.1.0 -black==22.10.0 +black==22.12.0 blender-id-oauth-client @ git+https://gitlab.com/blender-institute/blender-id-oauth-client.git@37aa143e275fe120ec71688c14f4f25eb45426f1 boto3==1.28.70 botocore==1.31.70 @@ -34,7 +34,7 @@ django4-background-tasks==1.2.7 dulwich==0.21.6 factory-boy==3.2.1 Faker==13.12.1 -filelock==3.12.4 +filelock==3.7.1 frozenlist==1.3.1 google-i18n-address==2.5.2 gql==3.3.0 @@ -64,7 +64,7 @@ pathspec==0.9.0 pexpect==4.8.0 Pillow==9.1.1 pkginfo==1.9.6 -platformdirs==3.11.0 +platformdirs==2.5.2 poetry==1.6.1 poetry-core==1.7.0 poetry-plugin-export==1.5.0 -- 2.30.2 From 0ee2e44aed033c0c8eb12f9699b0be17c1b3c1c2 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 21:09:25 -0500 Subject: [PATCH 06/15] Revert "Revert to Poetrys versions" This reverts commit 8fcf1d74700f1fd690e27ec01a55ed5c927c4c76. --- requirements.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 141f35c5..01a29f79 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ aiosignal==1.2.0 asgiref==3.5.2 async-timeout==4.0.2 attrs==22.1.0 -black==22.12.0 +black==22.10.0 blender-id-oauth-client @ git+https://gitlab.com/blender-institute/blender-id-oauth-client.git@37aa143e275fe120ec71688c14f4f25eb45426f1 boto3==1.28.70 botocore==1.31.70 @@ -34,7 +34,7 @@ django4-background-tasks==1.2.7 dulwich==0.21.6 factory-boy==3.2.1 Faker==13.12.1 -filelock==3.7.1 +filelock==3.12.4 frozenlist==1.3.1 google-i18n-address==2.5.2 gql==3.3.0 @@ -64,7 +64,7 @@ pathspec==0.9.0 pexpect==4.8.0 Pillow==9.1.1 pkginfo==1.9.6 -platformdirs==2.5.2 +platformdirs==3.11.0 poetry==1.6.1 poetry-core==1.7.0 poetry-plugin-export==1.5.0 @@ -97,7 +97,6 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.12.1 trove-classifiers==2023.8.7 -tweepy==3.10.0 types-pytz==2021.3.8 types-PyYAML==6.0.8 typing_extensions==4.9.0 -- 2.30.2 From de9cee7ab8ed48cee20f442c1e171b6bf947f163 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 21:16:37 -0500 Subject: [PATCH 07/15] add gunicorn and procfile for heroku --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 01a29f79..6c5c90e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -97,6 +97,7 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.12.1 trove-classifiers==2023.8.7 +tweepy==3.10.0 types-pytz==2021.3.8 types-PyYAML==6.0.8 typing_extensions==4.9.0 -- 2.30.2 From 8217f8f6ec7f2714f68d59ef44967620c2139d79 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 21:44:49 -0500 Subject: [PATCH 08/15] add database URL to common settings --- conference/settings_common.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conference/settings_common.py b/conference/settings_common.py index f97aad33..2d45a482 100644 --- a/conference/settings_common.py +++ b/conference/settings_common.py @@ -117,6 +117,9 @@ DATABASES = { } } +db_from_env = dj_database_url.config(conn_max_age=600) +DATABASES['default'].update(db_from_env) + # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators -- 2.30.2 From d41962b1a3cd3e67c77d3bfc4b7c17c340ba9aec Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 21:59:40 -0500 Subject: [PATCH 09/15] Import dj_database_url --- conference/settings_common.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conference/settings_common.py b/conference/settings_common.py index 2d45a482..017e5b39 100644 --- a/conference/settings_common.py +++ b/conference/settings_common.py @@ -1,6 +1,7 @@ from typing import List import os import pathlib +import dj_database_url from sentry_sdk.integrations.django import DjangoIntegration import sentry_sdk @@ -117,9 +118,6 @@ DATABASES = { } } -db_from_env = dj_database_url.config(conn_max_age=600) -DATABASES['default'].update(db_from_env) - # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators -- 2.30.2 From a15613343cb758b58dfd1c5fe4ae56b1d0c13753 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 4 Oct 2023 22:09:57 -0500 Subject: [PATCH 10/15] Update gitignore just to ingore my unsafe settings.py.backup --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index afaa203c..c79329de 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ *.sock *.pid *.python-version - +/conference/settings.py.backup 99_vault.yaml -- 2.30.2 From 7b937f1eb52d89c1dbf80bd75f1815de263f1a26 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Sun, 15 Oct 2023 17:40:21 -0500 Subject: [PATCH 11/15] override site_id --- conference/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conference/settings.py b/conference/settings.py index e5eee32d..27c1eb30 100644 --- a/conference/settings.py +++ b/conference/settings.py @@ -29,6 +29,8 @@ INSTALLED_APPS.append('storages') SITE_ID = int(os.environ.get('SITE_ID')) +SITE_ID = 2 + BLENDER_ID = { # MUST end in a slash: 'BASE_URL': os.environ.get('BASE_URL'), -- 2.30.2 From 1bd1f4767fabebbc093f96cb7f038cd20f6bc9da Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Sun, 15 Oct 2023 17:45:48 -0500 Subject: [PATCH 12/15] remove extra import in common settings --- conference/settings_common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conference/settings_common.py b/conference/settings_common.py index 017e5b39..f97aad33 100644 --- a/conference/settings_common.py +++ b/conference/settings_common.py @@ -1,7 +1,6 @@ from typing import List import os import pathlib -import dj_database_url from sentry_sdk.integrations.django import DjangoIntegration import sentry_sdk -- 2.30.2 From 3eff532c0f9fa55e7a6d86af22ba7b023bc11979 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Sun, 15 Oct 2023 17:49:53 -0500 Subject: [PATCH 13/15] Update shared assets --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 150c8875..d520d542 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 150c8875e119eaf638e7d6a7a6f22b50b13c6c3a +Subproject commit d520d54265caa675b68127aeabd474df8ed3fdfe -- 2.30.2 From 0bd01faf545ab36d639cb2901bb83df00421eab5 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Wed, 25 Oct 2023 12:39:48 -0500 Subject: [PATCH 14/15] Switch to using S3 for file uploads --- conference/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conference/settings.py b/conference/settings.py index 27c1eb30..15225599 100644 --- a/conference/settings.py +++ b/conference/settings.py @@ -29,6 +29,8 @@ INSTALLED_APPS.append('storages') SITE_ID = int(os.environ.get('SITE_ID')) +INSTALLED_APPS.append('storages') + SITE_ID = 2 BLENDER_ID = { -- 2.30.2 From 52006df21d0acf2a2ab99046dd96cbcf4645bf4a Mon Sep 17 00:00:00 2001 From: Jason van Gumster Date: Mon, 4 Dec 2023 14:49:43 -0500 Subject: [PATCH 15/15] Trying to add a bit of placeholder text on talk proposals. This is kind of a dirty fix. I suspect that the MesssageForm class gets used elsewhere (like for contact forms and the like), so if that's the case, we may need to make a specific PresentationProposalForm class and use that in `conference_main/views/event.py` (where the form is actually built). --- conference_main/forms.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conference_main/forms.py b/conference_main/forms.py index c9f4c4f5..571691d1 100644 --- a/conference_main/forms.py +++ b/conference_main/forms.py @@ -37,7 +37,11 @@ class PresentationForm(forms.ModelForm): class MessageForm(forms.Form): - message = forms.CharField(widget=forms.Textarea) + message = forms.CharField(widget=forms.Textarea( + attrs={'placeholder': ''' + (Main Stage, 20 minutes)\n\nThis totally awesome talk is going to be about... + ''' + )) class FestivalEntryForm(forms.ModelForm): -- 2.30.2