From b98d6553e1f42b06f9931eeee3e5bf2df6175c32 Mon Sep 17 00:00:00 2001 From: MayaK Date: Tue, 20 May 2025 12:57:32 -0400 Subject: [PATCH 1/6] Adding Speakers Application skeleton --- portal/settings.py | 1 + portal/urls.py | 1 + speaker/__init__.py | 0 speaker/admin.py | 0 speaker/apps.py | 6 + speaker/constants.py | 31 ++ .../speaker_profile_email_notification.html | 0 .../speaker_profile_email_notification.txt | 0 speaker/forms.py | 67 ++++ speaker/languages.py | 321 ++++++++++++++++++ speaker/models.py | 249 ++++++++++++++ speaker/tests.py | 0 speaker/urls.py | 35 ++ speaker/views.py | 73 ++++ storage_backend/custom_storage.py | 8 - templates/portal/base.html | 3 + templates/speaker/index.html | 27 ++ templates/speaker/speakerprofile_detail.html | 222 ++++++++++++ templates/speaker/speakerprofile_form.html | 0 19 files changed, 1036 insertions(+), 8 deletions(-) create mode 100644 speaker/__init__.py create mode 100644 speaker/admin.py create mode 100644 speaker/apps.py create mode 100644 speaker/constants.py create mode 100644 speaker/email/speaker_profile_email_notification.html create mode 100644 speaker/email/speaker_profile_email_notification.txt create mode 100644 speaker/forms.py create mode 100644 speaker/languages.py create mode 100644 speaker/models.py create mode 100644 speaker/tests.py create mode 100644 speaker/urls.py create mode 100644 speaker/views.py create mode 100644 templates/speaker/index.html create mode 100644 templates/speaker/speakerprofile_detail.html create mode 100644 templates/speaker/speakerprofile_form.html diff --git a/portal/settings.py b/portal/settings.py index 57411d43..b7dffa9b 100644 --- a/portal/settings.py +++ b/portal/settings.py @@ -48,6 +48,7 @@ "storages", "portal", "volunteer", + "speaker", "portal_account", "widget_tweaks", ] diff --git a/portal/urls.py b/portal/urls.py index fe9b8327..63ee8b34 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ path("", views.index, name="index"), path("volunteer/", include("volunteer.urls", namespace="volunteer")), + path("speaker/", include("speaker.urls", namespace="speaker")), path("admin/", admin.site.urls), path("accounts/", include("allauth.urls")), path( diff --git a/speaker/__init__.py b/speaker/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/speaker/admin.py b/speaker/admin.py new file mode 100644 index 00000000..e69de29b diff --git a/speaker/apps.py b/speaker/apps.py new file mode 100644 index 00000000..65bb0a6f --- /dev/null +++ b/speaker/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class VolunteerConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "speaker" diff --git a/speaker/constants.py b/speaker/constants.py new file mode 100644 index 00000000..45580333 --- /dev/null +++ b/speaker/constants.py @@ -0,0 +1,31 @@ +from enum import StrEnum + + +# class RoleTypes(StrEnum): +# """Role types for the volunteer.""" + +# ADMIN = "Admin" +# STAFF = "Staff" +# VENDOR = "Vendor" +# VOLUNTEER = "Volunteer" + + +class ApplicationStatus(StrEnum): + """Application status for the volunteer.""" + + PENDING = "Pending Review" + APPROVED = "Approved" + REJECTED = "Rejected" + CANCELLED = "Cancelled" + + +class Region(StrEnum): + """Region where the volunteer usually reside.""" + + NO_REGION = "" + ASIA = "Asia" + EUROPE = "Europe" + NORTH_AMERICA = "North America" + SOUTH_AMERICA = "South America" + AFRICA = "Africa" + OCEANIA = "Oceania" diff --git a/speaker/email/speaker_profile_email_notification.html b/speaker/email/speaker_profile_email_notification.html new file mode 100644 index 00000000..e69de29b diff --git a/speaker/email/speaker_profile_email_notification.txt b/speaker/email/speaker_profile_email_notification.txt new file mode 100644 index 00000000..e69de29b diff --git a/speaker/forms.py b/speaker/forms.py new file mode 100644 index 00000000..d6b222c8 --- /dev/null +++ b/speaker/forms.py @@ -0,0 +1,67 @@ +import re + +from django import forms +from django.core.exceptions import ValidationError +from django.forms import ModelForm +from django.forms.widgets import SelectMultiple + +from .languages import LANGUAGES +from .models import SpeakerProfile + +class LanguageSelectMultiple(SelectMultiple): + """ + A custom widget for selecting multiple languages with autocomplete. + """ + + def __init__(self, attrs=None, choices=()): + default_attrs = { + "class": "form-control select2-multiple", + "data-placeholder": "Start typing to select languages...", + } + if attrs: + default_attrs.update(attrs) + super().__init__(default_attrs, choices) + +class SpeakerProfileForm(ModelForm): + + # discord_username = forms.CharField(required=True) + additional_comments = forms.CharField(widget=forms.Textarea, required=False) + + class Meta: + model = SpeakerProfile + exclude = ["user", "application_status"] + help_texts = { + # "github_username": "GitHub username (e.g., username)", + # "discord_username": "Required - Your Discord username for team communication (e.g., username#1234)", + # "instagram_username": "Instagram username without @ (e.g., username)", + # "bluesky_username": "Bluesky username (e.g., username or username.bsky.social)", + # "mastodon_url": "Mastodon handle (e.g., @username@instance.tld or https://instance.tld/@username)", + # "x_username": "X/Twitter username without @ (e.g., username)", + # "linkedin_url": "LinkedIn URL (e.g., linkedin.com/in/username)", + "region": "Region where you normally reside", + } + + def clean(self): + cleaned_data = super().clean() + return cleaned_data + + def __init__(self, *args, **kwargs): + self.user = kwargs.pop("user", None) + super().__init__(*args, **kwargs) + + sorted_languages = sorted(LANGUAGES, key=lambda x: x[1]) + + self.fields["discord_username"].required = True + self.fields["languages_spoken"].choices = sorted_languages + self.fields["languages_spoken"].widget = LanguageSelectMultiple( + choices=sorted_languages + ) + + if self.instance and self.instance.pk: + pass + + def save(self, commit=True): + if self.user: + self.instance.user = self.user + volunteer_profile = super().save(commit) + return volunteer_profile diff --git a/speaker/languages.py b/speaker/languages.py new file mode 100644 index 00000000..4b462430 --- /dev/null +++ b/speaker/languages.py @@ -0,0 +1,321 @@ +""" +This module contains a list of language choices based on the Wikipedia page +"List of language names" (https://en.wikipedia.org/wiki/List_of_language_names). + +The list is used to replace Django's default LANGUAGES list for the languages_spoken field +in the VolunteerProfile model. + +For languages that don't have standard ISO 639-1 two-letter codes, unique codes have been +invented following the pattern of existing codes. +""" + +# List of language choices based on https://en.wikipedia.org/wiki/List_of_language_names +# Format: (language_code, language_name) +LANGUAGES = [ + ("aa", "Afar"), + ("ab", "Abkhazian"), + ("ae", "Avestan"), + ("af", "Afrikaans"), + ("ak", "Akan"), + ("am", "Amharic"), + ("an", "Aragonese"), + ("ar", "Arabic"), + ("as", "Assamese"), + ("av", "Avaric"), + ("ay", "Aymara"), + ("az", "Azerbaijani"), + ("ba", "Bashkir"), + ("be", "Belarusian"), + ("bg", "Bulgarian"), + ("bh", "Bihari languages"), + ("bi", "Bislama"), + ("bm", "Bambara"), + ("bn", "Bengali"), + ("bo", "Tibetan"), + ("br", "Breton"), + ("bs", "Bosnian"), + ("ca", "Catalan"), + ("ce", "Chechen"), + ("ch", "Chamorro"), + ("co", "Corsican"), + ("cr", "Cree"), + ("cs", "Czech"), + ("cu", "Church Slavic"), + ("cv", "Chuvash"), + ("cy", "Welsh"), + ("da", "Danish"), + ("de", "German"), + ("dv", "Divehi"), + ("dz", "Dzongkha"), + ("ee", "Ewe"), + ("el", "Greek"), + ("en", "English"), + ("eo", "Esperanto"), + ("es", "Spanish"), + ("et", "Estonian"), + ("eu", "Basque"), + ("fa", "Persian"), + ("ff", "Fulah"), + ("fi", "Finnish"), + ("fj", "Fijian"), + ("fo", "Faroese"), + ("fr", "French"), + ("fy", "Western Frisian"), + ("ga", "Irish"), + ("gd", "Gaelic"), + ("gl", "Galician"), + ("gn", "Guarani"), + ("gu", "Gujarati"), + ("gv", "Manx"), + ("ha", "Hausa"), + ("he", "Hebrew"), + ("hi", "Hindi"), + ("ho", "Hiri Motu"), + ("hr", "Croatian"), + ("ht", "Haitian"), + ("hu", "Hungarian"), + ("hy", "Armenian"), + ("hz", "Herero"), + ("ia", "Interlingua"), + ("id", "Indonesian"), + ("ie", "Interlingue"), + ("ig", "Igbo"), + ("ii", "Sichuan Yi"), + ("ik", "Inupiaq"), + ("io", "Ido"), + ("is", "Icelandic"), + ("it", "Italian"), + ("iu", "Inuktitut"), + ("ja", "Japanese"), + ("jv", "Javanese"), + ("ka", "Georgian"), + ("kg", "Kongo"), + ("ki", "Kikuyu"), + ("kj", "Kuanyama"), + ("kk", "Kazakh"), + ("kl", "Kalaallisut"), + ("km", "Khmer"), + ("kn", "Kannada"), + ("ko", "Korean"), + ("kr", "Kanuri"), + ("ks", "Kashmiri"), + ("ku", "Kurdish"), + ("kv", "Komi"), + ("kw", "Cornish"), + ("ky", "Kirghiz"), + ("la", "Latin"), + ("lb", "Luxembourgish"), + ("lg", "Ganda"), + ("li", "Limburgan"), + ("ln", "Lingala"), + ("lo", "Lao"), + ("lt", "Lithuanian"), + ("lu", "Luba-Katanga"), + ("lv", "Latvian"), + ("mg", "Malagasy"), + ("mh", "Marshallese"), + ("mi", "Maori"), + ("mk", "Macedonian"), + ("ml", "Malayalam"), + ("mn", "Mongolian"), + ("mr", "Marathi"), + ("ms", "Malay"), + ("mt", "Maltese"), + ("my", "Burmese"), + ("na", "Nauru"), + ("nb", "Norwegian Bokmål"), + ("nd", "North Ndebele"), + ("ne", "Nepali"), + ("ng", "Ndonga"), + ("nl", "Dutch"), + ("nn", "Norwegian Nynorsk"), + ("no", "Norwegian"), + ("nr", "South Ndebele"), + ("nv", "Navajo"), + ("ny", "Nyanja"), + ("oc", "Occitan"), + ("oj", "Ojibwa"), + ("om", "Oromo"), + ("or", "Oriya"), + ("os", "Ossetian"), + ("pa", "Punjabi"), + ("pi", "Pali"), + ("pl", "Polish"), + ("ps", "Pushto"), + ("pt", "Portuguese"), + ("qu", "Quechua"), + ("rm", "Romansh"), + ("rn", "Rundi"), + ("ro", "Romanian"), + ("ru", "Russian"), + ("rw", "Kinyarwanda"), + ("sa", "Sanskrit"), + ("sc", "Sardinian"), + ("sd", "Sindhi"), + ("se", "Northern Sami"), + ("sg", "Sango"), + ("si", "Sinhala"), + ("sk", "Slovak"), + ("sl", "Slovenian"), + ("sm", "Samoan"), + ("sn", "Shona"), + ("so", "Somali"), + ("sq", "Albanian"), + ("sr", "Serbian"), + ("ss", "Swati"), + ("st", "Southern Sotho"), + ("su", "Sundanese"), + ("sv", "Swedish"), + ("sw", "Swahili"), + ("ta", "Tamil"), + ("te", "Telugu"), + ("tg", "Tajik"), + ("th", "Thai"), + ("ti", "Tigrinya"), + ("tk", "Turkmen"), + ("tl", "Tagalog"), + ("tn", "Tswana"), + ("to", "Tonga"), + ("tr", "Turkish"), + ("ts", "Tsonga"), + ("tt", "Tatar"), + ("tw", "Twi"), + ("ty", "Tahitian"), + ("ug", "Uighur"), + ("uk", "Ukrainian"), + ("ur", "Urdu"), + ("uz", "Uzbek"), + ("ve", "Venda"), + ("vi", "Vietnamese"), + ("vo", "Volapük"), + ("wa", "Walloon"), + ("wo", "Wolof"), + ("xh", "Xhosa"), + ("yi", "Yiddish"), + ("yo", "Yoruba"), + ("za", "Zhuang"), + ("zh", "Chinese"), + ("zu", "Zulu"), + # Additional languages with invented codes + ("ax", "Acehnese"), + ("ad", "Adyghe"), + ("ah", "Ahom"), + ("aj", "Ainu"), + ("al", "Akkadian"), + ("ap", "Algonquian languages"), + ("aq", "Ancient Egyptian"), + ("ac", "Ancient Greek"), + ("at", "Aramaic"), + ("ao", "Asturian"), + ("aw", "Awadhi"), + ("bc", "Balochi"), + ("bt", "Batak"), + ("bj", "Beja"), + ("bl", "Belarusian (Taraškievica)"), + ("bp", "Bhojpuri"), + ("by", "Buryat"), + ("cp", "Cantonese"), + ("ct", "Catalan (Valencian)"), + ("cg", "Chichewa"), + ("cl", "Classical Chinese"), + ("cq", "Crimean Tatar"), + ("dx", "Dalmatian"), + ("dm", "Dhivehi"), + ("dg", "Dogri"), + ("dl", "Dungan"), + ("em", "Egyptian Arabic"), + ("ep", "Emilian-Romagnol"), + ("ex", "Extremaduran"), + ("fc", "Franco-Provençal"), + ("fx", "Friulian"), + ("gc", "Gan Chinese"), + ("go", "Gothic"), + ("gr", "Greenlandic"), + ("hk", "Hakka Chinese"), + ("hw", "Hawaiian"), + ("hm", "Hmong"), + ("hx", "Hokkien"), + ("ix", "Ilokano"), + ("iv", "Ingush"), + ("jb", "Javanese (Basa Jawa)"), + ("jp", "Judeo-Persian"), + ("kc", "Kabardian"), + ("kb", "Kabyle"), + ("kp", "Kapampangan"), + ("ku", "Kashubian"), + ("kh", "Khasi"), + ("kx", "Khoisan languages"), + ("kd", "Komi-Permyak"), + ("kz", "Konkani"), + ("lc", "Ladino"), + ("lt", "Latgalian"), + ("lm", "Ligurian"), + ("lp", "Limburgish"), + ("lw", "Livonian"), + ("lh", "Lojban"), + ("lg", "Low German"), + ("ls", "Lower Sorbian"), + ("ma", "Maithili"), + ("mc", "Manchu"), + ("md", "Mandarin Chinese"), + ("mp", "Mapudungun"), + ("mw", "Marwari"), + ("mx", "Min Nan"), + ("mb", "Minangkabau"), + ("mo", "Mohawk"), + ("mu", "Moksha"), + ("me", "Mon"), + ("mv", "Montenegrin"), + ("nc", "Nahuatl"), + ("nm", "Nauruan"), + ("nj", "Navajo"), + ("nx", "Neapolitan"), + ("np", "Nepal Bhasa"), + ("nt", "Northern Sami"), + ("ob", "Occitan (post 1500)"), + ("od", "Odia"), + ("ol", "Old Church Slavonic"), + ("oe", "Old English"), + ("of", "Old French"), + ("oh", "Old High German"), + ("on", "Old Norse"), + ("op", "Old Persian"), + ("ot", "Old Turkic"), + ("ox", "Oromo"), + ("ow", "Ossetian"), + ("pc", "Pangasinan"), + ("px", "Papiamento"), + ("ph", "Pashto"), + ("pd", "Pennsylvania German"), + ("pm", "Piedmontese"), + ("po", "Pontic Greek"), + ("pr", "Proto-Indo-European"), + ("pw", "Punjabi (Western)"), + ("qc", "Quechua (additional dialects)"), + ("rj", "Rajasthani"), + ("rc", "Romani"), + ("rx", "Rusyn"), + ("sx", "Samogitian"), + ("sp", "Santali"), + ("sh", "Scots"), + ("sg", "Scottish Gaelic (additional dialects)"), + ("sb", "Serbo-Croatian"), + ("sf", "Shanghainese"), + ("sv", "Silesian"), + ("sz", "Sicilian"), + ("sy", "Syriac"), + ("tx", "Tamasheq"), + ("tm", "Tamashek"), + ("tc", "Taos"), + ("tb", "Tarifit"), + ("tp", "Tok Pisin"), + ("tu", "Tulu"), + ("ud", "Udmurt"), + ("us", "Upper Sorbian"), + ("uy", "Uyghur (additional script)"), + ("vx", "Venetian"), + ("vp", "Veps"), + ("wc", "Wu Chinese"), + ("ya", "Yakut"), + ("yu", "Yupik languages"), +] diff --git a/speaker/models.py b/speaker/models.py new file mode 100644 index 00000000..a39e454d --- /dev/null +++ b/speaker/models.py @@ -0,0 +1,249 @@ +import re + +from django.conf import settings +from django.contrib.auth.models import User +from django.contrib.sites.models import Site +from django.core.exceptions import ValidationError +from django.core.mail import EmailMultiAlternatives +from django.db import models +from django.db.models.signals import post_save +from django.dispatch import receiver +from django.template.loader import render_to_string +from django.urls import reverse + +from portal.models import BaseModel, ChoiceArrayField + +from .constants import ApplicationStatus, Region +from .languages import LANGUAGES + +APPLICATION_STATUS_CHOICES = [ + (ApplicationStatus.PENDING, ApplicationStatus.PENDING), + (ApplicationStatus.APPROVED, ApplicationStatus.APPROVED), + (ApplicationStatus.REJECTED, ApplicationStatus.REJECTED), + (ApplicationStatus.CANCELLED, ApplicationStatus.CANCELLED), +] + +REGION_CHOICES = [ + (Region.NO_REGION, Region.NO_REGION), + (Region.NORTH_AMERICA, Region.NORTH_AMERICA), + (Region.SOUTH_AMERICA, Region.SOUTH_AMERICA), + (Region.EUROPE, Region.EUROPE), + (Region.AFRICA, Region.AFRICA), + (Region.ASIA, Region.ASIA), + (Region.OCEANIA, Region.OCEANIA), +] + + +# class Team(BaseModel): +# short_name = models.CharField("name", max_length=40) +# description = models.CharField("description", max_length=1000) +# team_leads = models.ManyToManyField( +# "speaker.SpeakerProfile", +# verbose_name="team leads", +# related_name="team_leads", +# ) + +# def __str__(self): +# return self.short_name + + +# class Role(BaseModel): +# short_name = models.CharField("name", max_length=40) +# description = models.CharField("description", max_length=1000) + +# def __str__(self): +# return self.short_name + + +class SpeakerProfile(BaseModel): + # user = models.OneToOneField(User, on_delete=models.CASCADE) + # roles = models.ManyToManyField( + # "Role", verbose_name="Roles", related_name="roles", blank=True + # ) + application_status = models.CharField( + max_length=50, + choices=APPLICATION_STATUS_CHOICES, + default=ApplicationStatus.PENDING, + ) + + # social media urls + # github_username = models.CharField(max_length=50, blank=True, null=True) + # discord_username = models.CharField( + # max_length=50, + # blank=False, + # null=False, + # verbose_name="Discord username (required)", + # help_text="Required - Your Discord username for team communication", + # default="", + # ) + # instagram_username = models.CharField(max_length=50, blank=True, null=True) + # bluesky_username = models.CharField(max_length=100, blank=True, null=True) + # mastodon_url = models.CharField(max_length=100, blank=True, null=True) + # x_username = models.CharField(max_length=100, blank=True, null=True) + # linkedin_url = models.CharField(max_length=100, blank=True, null=True) + languages_spoken = ChoiceArrayField( + models.CharField(max_length=32, blank=True, choices=LANGUAGES) + ) + # teams = models.ManyToManyField( + # "speaker.Team", verbose_name="team", related_name="team", blank=True + # ) + # pyladies_chapter = models.CharField(max_length=50, blank=True, null=True) + additional_comments = models.CharField(max_length=1000, blank=True, null=True) + # availability_hours_per_week = models.PositiveIntegerField(default=1) + region = models.CharField( + max_length=50, + choices=REGION_CHOICES, + default=Region.NO_REGION, + ) + + def clean(self): + super().clean() + # self._validate_github_username() + # self._validate_discord_username() + # self._validate_instagram_username() + # self._validate_bluesky_username() + # self._validate_mastodon_url() + # self._validate_x_username() + # self._validate_linkedin_url() + + # def _validate_github_username(self): + # if self.github_username: + # if not re.match( + # r"^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9])){0,38}$", + # self.github_username, + # ): + # raise ValidationError( + # { + # "github_username": "GitHub username can only contain alphanumeric characters and hyphens, " + # "cannot start or end with a hyphen, and must be between 1-39 characters." + # } + # ) + + # def _validate_discord_username(self): + # if self.discord_username: + # if not re.match( + # r"^[a-zA-Z0-9](?:[a-zA-Z0-9]|[._-](?=[a-zA-Z0-9])){0,30}[a-zA-Z0-9]$", + # self.discord_username, + # ): + # if len(self.discord_username) < 2 or len(self.discord_username) > 32: + # raise ValidationError( + # { + # "discord_username": "Discord username must be between 2 and 32 characters." + # } + # ) + # else: + # raise ValidationError( + # { + # "discord_username": "Discord username must consist of alphanumeric characters, " + # "dots, underscores, or hyphens, and cannot have consecutive special characters." + # } + # ) + + # def _validate_instagram_username(self): + # if self.instagram_username: + # if not re.match(r"^[a-zA-Z0-9._]{1,30}$", self.instagram_username): + # raise ValidationError( + # { + # "instagram_username": "Instagram username can only contain alphanumeric characters, " + # "periods, and underscores, and must be between 1-30 characters." + # } + # ) + + # def _validate_bluesky_username(self): + # if self.bluesky_username: + # if not re.match( + # r"^[a-zA-Z0-9][a-zA-Z0-9.-]{0,28}[a-zA-Z0-9](\.[a-zA-Z0-9][\w.-]*\.[a-zA-Z]{2,})?$", + # self.bluesky_username, + # ): + # raise ValidationError( + # { + # "bluesky_username": "Invalid Bluesky username format. " + # "Should be either a simple username or a full handle (e.g., username.bsky.social)." + # } + # ) + + # def _validate_mastodon_url(self): + # if self.mastodon_url: + # mastodon_pattern1 = r"^@[a-zA-Z0-9_]+@[a-zA-Z0-9][a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" # @user@instance.tld + # mastodon_pattern2 = r"^https?://[a-zA-Z0-9][a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/@[a-zA-Z0-9_]+$" # https://instance.tld/@user + + # if not ( + # re.match(mastodon_pattern1, self.mastodon_url) + # or re.match(mastodon_pattern2, self.mastodon_url) + # ): + # raise ValidationError( + # { + # "mastodon_url": "Invalid Mastodon URL format. " + # "Should be either @username@instance.tld or https://instance.tld/@username." + # } + # ) + + # def _validate_x_username(self): + # if self.x_username: + # if not re.match(r"^[a-zA-Z0-9_]{1,15}$", self.x_username): + # raise ValidationError( + # { + # "x_username": "X/Twitter username can only contain alphanumeric characters and underscores, " + # "and must be between 1-15 characters." + # } + # ) + + # def _validate_linkedin_url(self): + # if self.linkedin_url: + # linkedin_pattern = ( + # r"^(https?://)?(www\.)?linkedin\.com/in/[a-zA-Z0-9_-]+/?$" + # ) + + # if not re.match(linkedin_pattern, self.linkedin_url): + # raise ValidationError( + # { + # "linkedin_url": "Invalid LinkedIn URL format. " + # "Should be in the format: linkedin.com/in/username or https://www.linkedin.com/in/username." + # } + # ) + + def __str__(self): + return self.user.username + + def get_absolute_url(self): + return reverse("speaker:speaker_profile_edit", kwargs={"pk": self.pk}) + + +def send_speaker_notification_email(instance, updated=False): + """Send email to the user whenever their speaker profile was updated/created.""" + context = {"profile": instance, "current_site": Site.objects.get_current()} + subject = f"{settings.ACCOUNT_EMAIL_SUBJECT_PREFIX} Speaker Application" + if updated: + context["updated"] = True + subject += " Updated" + else: + subject += " Received" + text_content = render_to_string( + "speaker/email/speaker_profile_email_notification.txt", + context=context, + ) + html_content = render_to_string( + "speaker/email/speaker_profile_email_notification.html", + context=context, + ) + + msg = EmailMultiAlternatives( + subject, + text_content, + settings.DEFAULT_FROM_EMAIL, + [instance.user.email], + ) + msg.attach_alternative(html_content, "text/html") + msg.send() + + +@receiver(post_save, sender=SpeakerProfile) +def speaker_profile_signal(sender, instance, created, **kwargs): + """Things to do whenever a speaker profile is created or updated. + + Send a notification email to the user to confirm their speaker application status. + """ + if created: + send_speaker_notification_email(instance) + else: + send_speaker_notification_email(instance, updated=True) diff --git a/speaker/tests.py b/speaker/tests.py new file mode 100644 index 00000000..e69de29b diff --git a/speaker/urls.py b/speaker/urls.py new file mode 100644 index 00000000..4e91a0dc --- /dev/null +++ b/speaker/urls.py @@ -0,0 +1,35 @@ +from django.contrib.auth.decorators import login_required +from django.urls import path + +from . import views + +app_name = "speaker" + +urlpatterns = [ + path("", views.index, name="index"), + path( + "list", + login_required(views.SpeakerProfileList.as_view()), + name="speaker_profile_list", + ), + path( + "view//", + login_required(views.SpeakerProfileView.as_view()), + name="speaker_profile_detail", + ), + path( + "new", + login_required(views.SpeakerProfileCreate.as_view()), + name="speaker_profile_new", + ), + path( + "edit/", + login_required(views.SpeakerProfileUpdate.as_view()), + name="speaker_profile_edit", + ), + path( + "delete/", + views.SpeakerProfileDelete.as_view(), + name="speaker_profile_delete", + ), +] diff --git a/speaker/views.py b/speaker/views.py new file mode 100644 index 00000000..f4ab2d0c --- /dev/null +++ b/speaker/views.py @@ -0,0 +1,73 @@ +from django.contrib.auth.decorators import login_required +from django.shortcuts import redirect, render +from django.urls import reverse_lazy +from django.views.generic import DetailView, ListView +from django.views.generic.edit import CreateView, DeleteView, UpdateView + +from .forms import SpeakerProfileForm +from .models import SpeakerProfile + + +@login_required +def index(request): + context = {} + try: + profile = SpeakerProfile.objects.get(user=request.user) + context["profile_id"] = profile.id + except SpeakerProfile.DoesNotExist: + context["profile_id"] = None + return render(request, "speaker/index.html", context) + + +class SpeakerProfileList(ListView): + model = SpeakerProfile + + +class SpeakerProfileView(DetailView): + model = SpeakerProfile + + def get(self, request, *args, **kwargs): + self.object = self.get_object() + if not self.object or self.object.user != request.user: + return redirect("speaker:index") + return super(SpeakerProfileView, self).get(request, *args, **kwargs) + + +class SpeakerProfileCreate(CreateView): + model = SpeakerProfile + template_name = "speaker/speakerprofile_form.html" + success_url = reverse_lazy("speaker:index") + form_class = SpeakerProfileForm + + def get(self, request, *args, **kwargs): + if SpeakerProfile.objects.filter(user__id=request.user.id).exists(): + return redirect("speaker:index") + return super(SpeakerProfileCreate, self).get(request, *args, **kwargs) + + def get_form_kwargs(self): + kwargs = super(SpeakerProfileCreate, self).get_form_kwargs() + kwargs.update({"user": self.request.user}) + return kwargs + + +class SpeakerProfileUpdate(UpdateView): + model = SpeakerProfile + template_name = "speaker/speakerprofile_form.html" + success_url = reverse_lazy("speaker:index") + form_class = SpeakerProfileForm + + def get(self, request, *args, **kwargs): + self.object = self.get_object() + if not self.object or self.object.user != request.user: + return redirect("speaker:index") + return super(SpeakerProfileUpdate, self).get(request, *args, **kwargs) + + def get_form_kwargs(self): + kwargs = super(SpeakerProfileUpdate, self).get_form_kwargs() + kwargs.update({"user": self.request.user}) + return kwargs + + +class SpeakerProfileDelete(DeleteView): + model = SpeakerProfile + success_url = reverse_lazy("speaker:index") diff --git a/storage_backend/custom_storage.py b/storage_backend/custom_storage.py index 6a81c763..e69de29b 100644 --- a/storage_backend/custom_storage.py +++ b/storage_backend/custom_storage.py @@ -1,8 +0,0 @@ -from storages.backends.s3boto3 import S3Boto3Storage - - -class MediaStorage(S3Boto3Storage): - """Media Storage files""" - - location = "media" - file_overwrite = False diff --git a/templates/portal/base.html b/templates/portal/base.html index 0a860636..910a2958 100644 --- a/templates/portal/base.html +++ b/templates/portal/base.html @@ -58,6 +58,9 @@
  • Volunteer
    • +
  • + Speak +
    • {% endif %}
  • Portal Docs diff --git a/templates/speaker/index.html b/templates/speaker/index.html new file mode 100644 index 00000000..9e80a9b8 --- /dev/null +++ b/templates/speaker/index.html @@ -0,0 +1,27 @@ +{% extends "portal/base.html" %} +{% load allauth i18n %} +{% load django_bootstrap5 %} +{% block body %} +{% endblock body %} +{% block content %} +

    + Speaker Profile +

    + {% if profile_id %} + View my Profile + Edit Profile + {% else %} +

    + You have not created your Speaker Profile yet. Once you created your profile, our team will review it. + We will then assign you to the appropriate team that needs help so you can get set up with the + necessary access. +

    + Create my Profile + {% endif %} +{% endblock content %} diff --git a/templates/speaker/speakerprofile_detail.html b/templates/speaker/speakerprofile_detail.html new file mode 100644 index 00000000..439326cb --- /dev/null +++ b/templates/speaker/speakerprofile_detail.html @@ -0,0 +1,222 @@ +{% extends "portal/base.html" %} +{% load allauth i18n %} +{% load django_bootstrap5 %} +{% block body %} +{% endblock body %} +{% block content %} +

    + Your Speaker Profile +

    +
    +
    +
    + Basic Information +
    +
    +
    +
    +
    + Username: +
    +
    + {{ object.user.username }} +
    +
    +
    +
    + Name: +
    +
    + {{ object.user.first_name }} {{ object.user.last_name }} +
    +
    +
    +
    + Email: +
    +
    + {{ object.user.email }} +
    +
    +
    +
    + Availability: +
    +
    +

    {{ object.availability_hours_per_week|default:0 }} hours per week

    +
    +
    +
    +
    + Region: +
    +
    + {{ object.region|default:"Not specified" }} +
    +
    +
    +
    + PyLadies Chapter: +
    +
    + {{ object.pyladies_chapter|default:"Not specified" }} +
    +
    +
    +
    + Application Status: +
    +
    + {{ object.application_status }} +
    +
    +
    +
    + Languages: +
    +
    + {% for language in object.languages_spoken %} + {{ language }} + {% endfor %} +
    +
    +
    +
    +
    +
    +
    + Teams & Roles +
    +
    +
    +
    +
    + Teams: +
    +
    + {% if object.teams.all %} + {% for team in object.teams.all %} + {{ team.short_name }} + {% endfor %} + {% else %} + Not assigned to any teams yet + {% endif %} +
    +
    +
    +
    + Roles: +
    +
    + {% if object.roles.all %} + {% for role in object.roles.all %} + {{ role.short_name }} + {% endfor %} + {% else %} + No roles assigned yet + {% endif %} +
    +
    +
    +
    +
    +
    +
    + Social Media +
    +
    +
    + {% if object.github_username or object.discord_username or object.instagram_username or object.bluesky_username or object.mastodon_url or object.x_username or object.linkedin_url %} + {% if object.github_username %} +
    +
    + GitHub: +
    +
    + {{ object.github_username }} +
    +
    + {% endif %} + {% if object.discord_username %} +
    +
    + Discord: +
    +
    + {{ object.discord_username }} +
    +
    + {% endif %} + {% if object.instagram_username %} +
    +
    + Instagram: +
    +
    + {{ object.instagram_username }} +
    +
    + {% endif %} + {% if object.bluesky_username %} +
    +
    + Bluesky: +
    +
    + {{ object.bluesky_username }} +
    +
    + {% endif %} + {% if object.mastodon_url %} +
    +
    + Mastodon: +
    +
    + {{ object.mastodon_url }} +
    +
    + {% endif %} + {% if object.x_username %} +
    +
    + X/Twitter: +
    +
    + {{ object.x_username }} +
    +
    + {% endif %} + {% if object.linkedin_url %} +
    +
    + LinkedIn: +
    +
    + {{ object.linkedin_url }} +
    +
    + {% endif %} + {% else %} +

    + No social media profiles added +

    + {% endif %} +
    +
    +
    +
    +
    + Additional Comments +
    +
    +
    +

    {{ object.additional_comments }}

    +
    +
    +
    + Edit Profile + Back to Speaker Dashboard +
    +{% endblock content %} diff --git a/templates/speaker/speakerprofile_form.html b/templates/speaker/speakerprofile_form.html new file mode 100644 index 00000000..e69de29b From 7ae246944942a464a7eb73417d44a2d54ff258dc Mon Sep 17 00:00:00 2001 From: MayaK Date: Tue, 20 May 2025 14:10:46 -0400 Subject: [PATCH 2/6] Merge with home computer --- speaker/models.py | 59 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/speaker/models.py b/speaker/models.py index a39e454d..f4d843ff 100644 --- a/speaker/models.py +++ b/speaker/models.py @@ -55,18 +55,49 @@ # return self.short_name +# # Pretalx Data +# { +# "code": "WPSKUD", +# "name": "Maya Kerostasia", +# "biography": "blah blah blah", +# "submissions": [ +# "DBZ7HS" +# ], +# "avatar_url": "", +# "answers": [], +# "email": "mayakerostasia@gmail.com", +# "timezone": "UTC", +# "locale": "en", +# "has_arrived": false +# } + + class SpeakerProfile(BaseModel): - # user = models.OneToOneField(User, on_delete=models.CASCADE) - # roles = models.ManyToManyField( - # "Role", verbose_name="Roles", related_name="roles", blank=True - # ) application_status = models.CharField( max_length=50, choices=APPLICATION_STATUS_CHOICES, default=ApplicationStatus.PENDING, ) - # social media urls + # Pretalx Data + code = models.CharField(blank=True, null=False) + name = models.CharField(blank=True, null=True) + biography = models.CharField(blank=True, null=True) + avatar_url = models.CharField(blank=True, null=True) + email = models.CharField(blank=True, null=True) + timezone = models.CharField(blank=True, null=True) + locale = models.CharField(blank=True, null=True) + has_arrived = models.BooleanField(blank=True, null=True) + + submissions: [] + answers: [] + + # user = models.OneToOneField(User, on_delete=models.CASCADE) + # roles = models.ManyToManyField( + # "Role", verbose_name="Roles", related_name="roles", blank=True + # ) + + # # social media urls # github_username = models.CharField(max_length=50, blank=True, null=True) # discord_username = models.CharField( # max_length=50, @@ -81,20 +112,20 @@ class SpeakerProfile(BaseModel): # mastodon_url = models.CharField(max_length=100, blank=True, null=True) # x_username = models.CharField(max_length=100, blank=True, null=True) # linkedin_url = models.CharField(max_length=100, blank=True, null=True) - languages_spoken = ChoiceArrayField( - models.CharField(max_length=32, blank=True, choices=LANGUAGES) - ) + # languages_spoken = ChoiceArrayField( + # models.CharField(max_length=32, blank=True, choices=LANGUAGES) + # ) # teams = models.ManyToManyField( # "speaker.Team", verbose_name="team", related_name="team", blank=True # ) # pyladies_chapter = models.CharField(max_length=50, blank=True, null=True) additional_comments = models.CharField(max_length=1000, blank=True, null=True) # availability_hours_per_week = models.PositiveIntegerField(default=1) - region = models.CharField( - max_length=50, - choices=REGION_CHOICES, - default=Region.NO_REGION, - ) + # region = models.CharField( + # max_length=50, + # choices=REGION_CHOICES, + # default=Region.NO_REGION, + # ) def clean(self): super().clean() @@ -247,3 +278,5 @@ def speaker_profile_signal(sender, instance, created, **kwargs): send_speaker_notification_email(instance) else: send_speaker_notification_email(instance, updated=True) + + From edd4ba7b1a3a8af24e93d7c255f444dedc0c533c Mon Sep 17 00:00:00 2001 From: MayaK Date: Fri, 23 May 2025 12:21:04 -0400 Subject: [PATCH 3/6] xfer to home computer --- compose.yml | 1 + speaker/admin.py | 10 + speaker/api/__init__.py | 0 speaker/api/client.py | 69 ++++++ speaker/api/pretalx.py | 10 + speaker/forms.py | 8 +- speaker/migrations/0001_initial.py | 71 ++++++ speaker/migrations/__init__.py | 0 speaker/models.py | 159 +------------ speaker/urls.py | 10 +- speaker/views.py | 52 +++-- templates/speaker/email/base_email.html | 8 + templates/speaker/email/base_email.txt | 8 + .../speaker_profile_email_notification.html | 19 ++ .../speaker_profile_email_notification.txt | 14 ++ templates/speaker/index.html | 16 +- templates/speaker/speakerprofile_detail.html | 212 ------------------ 17 files changed, 258 insertions(+), 409 deletions(-) create mode 100644 speaker/api/__init__.py create mode 100644 speaker/api/client.py create mode 100644 speaker/api/pretalx.py create mode 100644 speaker/migrations/0001_initial.py create mode 100644 speaker/migrations/__init__.py create mode 100644 templates/speaker/email/base_email.html create mode 100644 templates/speaker/email/base_email.txt create mode 100644 templates/speaker/email/speaker_profile_email_notification.html create mode 100644 templates/speaker/email/speaker_profile_email_notification.txt diff --git a/compose.yml b/compose.yml index 3dcde70f..c3fffe01 100644 --- a/compose.yml +++ b/compose.yml @@ -43,6 +43,7 @@ services: DJANGO_DEFAULT_FROM_EMAIL: PyLadiesCon DJANGO_EMAIL_HOST: maildev DJANGO_EMAIL_PORT: 1025 + env_file: .env depends_on: redis: condition: service_healthy diff --git a/speaker/admin.py b/speaker/admin.py index e69de29b..201ba1d3 100644 --- a/speaker/admin.py +++ b/speaker/admin.py @@ -0,0 +1,10 @@ +from django.contrib import admin + +from .models import SpeakerProfile + +class SpeakerProfileAdmin(admin.ModelAdmin): + list_display = ("code", "name", "email") + search_fields = ("code", "name", "email") + # list_filter = ("region", "application_status") + +admin.site.register(SpeakerProfile, SpeakerProfileAdmin) diff --git a/speaker/api/__init__.py b/speaker/api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/speaker/api/client.py b/speaker/api/client.py new file mode 100644 index 00000000..205900b3 --- /dev/null +++ b/speaker/api/client.py @@ -0,0 +1,69 @@ +import os +import requests +import json + +class PretalxClient: + """ A simple client for interacting with Pretalx REST API """ + def __init__(self, base_url=None, default_headers=None, timeout=10): + token = os.getenv('PRETALX_API_TOKEN') + if not token: + raise ValueError("Please provide an environment Variable named 'PRETALX_API_TOKEN'") + else: + self.token = token + + self.session = requests.Session() + + self.base_url = base_url.rstrip('/') if base_url else None + self.timeout = timeout + + self.default_headers = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'User-Agent': 'Python PretalxClient/1.0' + } + + if default_headers: + self.default_headers.update(default_headers) + + self.session.headers.update(self.default_headers) + + + def auth(self): + """ Add Authentication parameters to the Pretalx Client Request """ + self.session.headers.update({"Authorization": f"Token {self.token}"}) + + def _build_url(self, endpoint: str) -> str: + url = f"{self.base_url}/{endpoint.lstrip('/')}" if self.base_url else endpoint + return url + + def get_events(self, event_name: str): + """ Get a list of events by name search """ + url = self._build_url("/events") + query = { + # "q": event_name + # "is_public": True + } + resp = self.session.get(url, params=query) + print(resp) + return resp.text + + def get_event(self, event_slug: str): + url = self._build_url(f"/events/{event_slug}") + resp = self.session.get(url) + print(resp) + return resp.json() + + def get_speakers(self, event_slug: str): + # https://pretalx.com/api/events/{event}/speakers/ + url = self._build_url(f"/events/{event_slug}/speakers") + resp = self.session.get(url) + resp.raise_for_status() + return resp.json() + + def get_speaker_information(self, event_slug: str): + # https://pretalx.com/api/events/{event}/speaker-information/ + url = self._build_url(f"/events/{event_slug}/speaker-information") + resp = self.session.get(url) + resp.raise_for_status() + return resp.json() + diff --git a/speaker/api/pretalx.py b/speaker/api/pretalx.py new file mode 100644 index 00000000..a33f448d --- /dev/null +++ b/speaker/api/pretalx.py @@ -0,0 +1,10 @@ +from .client import PretalxClient + +PRETALX_BASE_URL="https://pretalx.com/api" +EVENT_NAME="mayatest1-2025" + +def fetch_event_speakers(): + client = PretalxClient(base_url=PRETALX_BASE_URL) + client.auth() + return client.get_speakers(EVENT_NAME) + diff --git a/speaker/forms.py b/speaker/forms.py index d6b222c8..d9dd2971 100644 --- a/speaker/forms.py +++ b/speaker/forms.py @@ -29,7 +29,7 @@ class SpeakerProfileForm(ModelForm): class Meta: model = SpeakerProfile - exclude = ["user", "application_status"] + exclude = ["application_status"] help_texts = { # "github_username": "GitHub username (e.g., username)", # "discord_username": "Required - Your Discord username for team communication (e.g., username#1234)", @@ -46,7 +46,7 @@ def clean(self): return cleaned_data def __init__(self, *args, **kwargs): - self.user = kwargs.pop("user", None) + # self.user = kwargs.pop("user", None) super().__init__(*args, **kwargs) sorted_languages = sorted(LANGUAGES, key=lambda x: x[1]) @@ -61,7 +61,7 @@ def __init__(self, *args, **kwargs): pass def save(self, commit=True): - if self.user: - self.instance.user = self.user + # if self.user: + # self.instance.user = self.user volunteer_profile = super().save(commit) return volunteer_profile diff --git a/speaker/migrations/0001_initial.py b/speaker/migrations/0001_initial.py new file mode 100644 index 00000000..35bf961f --- /dev/null +++ b/speaker/migrations/0001_initial.py @@ -0,0 +1,71 @@ +# Generated by Django 5.1.8 on 2025-05-20 18:11 + +import django.db.models.deletion +import speaker.constants +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ("portal", "0001_initial"), + ] + + operations = [ + migrations.CreateModel( + name="SpeakerProfile", + fields=[ + ( + "basemodel_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="portal.basemodel", + ), + ), + ( + "application_status", + models.CharField( + choices=[ + ( + speaker.constants.ApplicationStatus["PENDING"], + speaker.constants.ApplicationStatus["PENDING"], + ), + ( + speaker.constants.ApplicationStatus["APPROVED"], + speaker.constants.ApplicationStatus["APPROVED"], + ), + ( + speaker.constants.ApplicationStatus["REJECTED"], + speaker.constants.ApplicationStatus["REJECTED"], + ), + ( + speaker.constants.ApplicationStatus["CANCELLED"], + speaker.constants.ApplicationStatus["CANCELLED"], + ), + ], + default=speaker.constants.ApplicationStatus["PENDING"], + max_length=50, + ), + ), + ("code", models.CharField(blank=True)), + ("name", models.CharField(blank=True, null=True)), + ("biography", models.CharField(blank=True, null=True)), + ("avatar_url", models.CharField(blank=True, null=True)), + ("email", models.CharField(blank=True, null=True)), + ("timezone", models.CharField(blank=True, null=True)), + ("locale", models.CharField(blank=True, null=True)), + ("has_arrived", models.BooleanField(blank=True, null=True)), + ( + "additional_comments", + models.CharField(blank=True, max_length=1000, null=True), + ), + ], + bases=("portal.basemodel",), + ), + ] diff --git a/speaker/migrations/__init__.py b/speaker/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/speaker/models.py b/speaker/models.py index f4d843ff..cc068ccf 100644 --- a/speaker/models.py +++ b/speaker/models.py @@ -34,26 +34,8 @@ ] -# class Team(BaseModel): -# short_name = models.CharField("name", max_length=40) -# description = models.CharField("description", max_length=1000) -# team_leads = models.ManyToManyField( -# "speaker.SpeakerProfile", -# verbose_name="team leads", -# related_name="team_leads", -# ) - -# def __str__(self): -# return self.short_name - - -# class Role(BaseModel): -# short_name = models.CharField("name", max_length=40) -# description = models.CharField("description", max_length=1000) - -# def __str__(self): -# return self.short_name - +class Event(BaseModel): + event_slug = models.CharField(blank=True, null=False) # # Pretalx Data # { @@ -92,35 +74,8 @@ class SpeakerProfile(BaseModel): submissions: [] answers: [] - # user = models.OneToOneField(User, on_delete=models.CASCADE) - # roles = models.ManyToManyField( - # "Role", verbose_name="Roles", related_name="roles", blank=True - # ) - - # # social media urls - # github_username = models.CharField(max_length=50, blank=True, null=True) - # discord_username = models.CharField( - # max_length=50, - # blank=False, - # null=False, - # verbose_name="Discord username (required)", - # help_text="Required - Your Discord username for team communication", - # default="", - # ) - # instagram_username = models.CharField(max_length=50, blank=True, null=True) - # bluesky_username = models.CharField(max_length=100, blank=True, null=True) - # mastodon_url = models.CharField(max_length=100, blank=True, null=True) - # x_username = models.CharField(max_length=100, blank=True, null=True) - # linkedin_url = models.CharField(max_length=100, blank=True, null=True) - # languages_spoken = ChoiceArrayField( - # models.CharField(max_length=32, blank=True, choices=LANGUAGES) - # ) - # teams = models.ManyToManyField( - # "speaker.Team", verbose_name="team", related_name="team", blank=True - # ) - # pyladies_chapter = models.CharField(max_length=50, blank=True, null=True) additional_comments = models.CharField(max_length=1000, blank=True, null=True) - # availability_hours_per_week = models.PositiveIntegerField(default=1) + # region = models.CharField( # max_length=50, # choices=REGION_CHOICES, @@ -129,117 +84,13 @@ class SpeakerProfile(BaseModel): def clean(self): super().clean() - # self._validate_github_username() - # self._validate_discord_username() - # self._validate_instagram_username() - # self._validate_bluesky_username() - # self._validate_mastodon_url() - # self._validate_x_username() - # self._validate_linkedin_url() - - # def _validate_github_username(self): - # if self.github_username: - # if not re.match( - # r"^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9])){0,38}$", - # self.github_username, - # ): - # raise ValidationError( - # { - # "github_username": "GitHub username can only contain alphanumeric characters and hyphens, " - # "cannot start or end with a hyphen, and must be between 1-39 characters." - # } - # ) - - # def _validate_discord_username(self): - # if self.discord_username: - # if not re.match( - # r"^[a-zA-Z0-9](?:[a-zA-Z0-9]|[._-](?=[a-zA-Z0-9])){0,30}[a-zA-Z0-9]$", - # self.discord_username, - # ): - # if len(self.discord_username) < 2 or len(self.discord_username) > 32: - # raise ValidationError( - # { - # "discord_username": "Discord username must be between 2 and 32 characters." - # } - # ) - # else: - # raise ValidationError( - # { - # "discord_username": "Discord username must consist of alphanumeric characters, " - # "dots, underscores, or hyphens, and cannot have consecutive special characters." - # } - # ) - - # def _validate_instagram_username(self): - # if self.instagram_username: - # if not re.match(r"^[a-zA-Z0-9._]{1,30}$", self.instagram_username): - # raise ValidationError( - # { - # "instagram_username": "Instagram username can only contain alphanumeric characters, " - # "periods, and underscores, and must be between 1-30 characters." - # } - # ) - - # def _validate_bluesky_username(self): - # if self.bluesky_username: - # if not re.match( - # r"^[a-zA-Z0-9][a-zA-Z0-9.-]{0,28}[a-zA-Z0-9](\.[a-zA-Z0-9][\w.-]*\.[a-zA-Z]{2,})?$", - # self.bluesky_username, - # ): - # raise ValidationError( - # { - # "bluesky_username": "Invalid Bluesky username format. " - # "Should be either a simple username or a full handle (e.g., username.bsky.social)." - # } - # ) - - # def _validate_mastodon_url(self): - # if self.mastodon_url: - # mastodon_pattern1 = r"^@[a-zA-Z0-9_]+@[a-zA-Z0-9][a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" # @user@instance.tld - # mastodon_pattern2 = r"^https?://[a-zA-Z0-9][a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/@[a-zA-Z0-9_]+$" # https://instance.tld/@user - - # if not ( - # re.match(mastodon_pattern1, self.mastodon_url) - # or re.match(mastodon_pattern2, self.mastodon_url) - # ): - # raise ValidationError( - # { - # "mastodon_url": "Invalid Mastodon URL format. " - # "Should be either @username@instance.tld or https://instance.tld/@username." - # } - # ) - - # def _validate_x_username(self): - # if self.x_username: - # if not re.match(r"^[a-zA-Z0-9_]{1,15}$", self.x_username): - # raise ValidationError( - # { - # "x_username": "X/Twitter username can only contain alphanumeric characters and underscores, " - # "and must be between 1-15 characters." - # } - # ) - - # def _validate_linkedin_url(self): - # if self.linkedin_url: - # linkedin_pattern = ( - # r"^(https?://)?(www\.)?linkedin\.com/in/[a-zA-Z0-9_-]+/?$" - # ) - - # if not re.match(linkedin_pattern, self.linkedin_url): - # raise ValidationError( - # { - # "linkedin_url": "Invalid LinkedIn URL format. " - # "Should be in the format: linkedin.com/in/username or https://www.linkedin.com/in/username." - # } - # ) def __str__(self): - return self.user.username + return self.name def get_absolute_url(self): return reverse("speaker:speaker_profile_edit", kwargs={"pk": self.pk}) - def send_speaker_notification_email(instance, updated=False): """Send email to the user whenever their speaker profile was updated/created.""" context = {"profile": instance, "current_site": Site.objects.get_current()} @@ -262,7 +113,7 @@ def send_speaker_notification_email(instance, updated=False): subject, text_content, settings.DEFAULT_FROM_EMAIL, - [instance.user.email], + [instance.email], ) msg.attach_alternative(html_content, "text/html") msg.send() diff --git a/speaker/urls.py b/speaker/urls.py index 4e91a0dc..dcbb0967 100644 --- a/speaker/urls.py +++ b/speaker/urls.py @@ -17,11 +17,11 @@ login_required(views.SpeakerProfileView.as_view()), name="speaker_profile_detail", ), - path( - "new", - login_required(views.SpeakerProfileCreate.as_view()), - name="speaker_profile_new", - ), + # path( + # "new", + # login_required(views.SpeakerProfileCreate.as_view()), + # name="speaker_profile_new", + # ), path( "edit/", login_required(views.SpeakerProfileUpdate.as_view()), diff --git a/speaker/views.py b/speaker/views.py index f4ab2d0c..3b5cd149 100644 --- a/speaker/views.py +++ b/speaker/views.py @@ -6,50 +6,64 @@ from .forms import SpeakerProfileForm from .models import SpeakerProfile +from .api.pretalx import fetch_event_speakers + +def pull_event_speakers(event_slug): + speaker_results = fetch_event_speakers() + print(speaker_results) + for speaker in speaker_results['results']: + print(speaker) @login_required def index(request): context = {} + print(request) try: - profile = SpeakerProfile.objects.get(user=request.user) + profile = SpeakerProfile.objects.first() context["profile_id"] = profile.id + pull_event_speakers("mayatest1-2025") except SpeakerProfile.DoesNotExist: context["profile_id"] = None return render(request, "speaker/index.html", context) - class SpeakerProfileList(ListView): model = SpeakerProfile - class SpeakerProfileView(DetailView): model = SpeakerProfile def get(self, request, *args, **kwargs): self.object = self.get_object() - if not self.object or self.object.user != request.user: + if not self.object or self.object.name != request.name: return redirect("speaker:index") return super(SpeakerProfileView, self).get(request, *args, **kwargs) -class SpeakerProfileCreate(CreateView): - model = SpeakerProfile - template_name = "speaker/speakerprofile_form.html" - success_url = reverse_lazy("speaker:index") - form_class = SpeakerProfileForm +### +# # CreateView does not need to Be Updated +### +# class SpeakerProfileCreate(CreateView): +# model = SpeakerProfile +# template_name = "speaker/speakerprofile_form.html" +# success_url = reverse_lazy("speaker:index") +# form_class = SpeakerProfileForm - def get(self, request, *args, **kwargs): - if SpeakerProfile.objects.filter(user__id=request.user.id).exists(): - return redirect("speaker:index") - return super(SpeakerProfileCreate, self).get(request, *args, **kwargs) +# def get(self, request, *args, **kwargs): +# if SpeakerProfile.objects.filter(speaker__name=request.name).exists(): +# return redirect("speaker:index") +# return super(SpeakerProfileCreate, self).get(request, *args, **kwargs) - def get_form_kwargs(self): - kwargs = super(SpeakerProfileCreate, self).get_form_kwargs() - kwargs.update({"user": self.request.user}) - return kwargs +# def get_form_kwargs(self): +# kwargs = super(SpeakerProfileCreate, self).get_form_kwargs() +# kwargs.update({"name": self.request.name}) +# return kwargs +### +# # As of right now, if we allow Speakers to update their Profiles +# # Outside of pretalx, the data will diverge +### class SpeakerProfileUpdate(UpdateView): model = SpeakerProfile template_name = "speaker/speakerprofile_form.html" @@ -58,13 +72,13 @@ class SpeakerProfileUpdate(UpdateView): def get(self, request, *args, **kwargs): self.object = self.get_object() - if not self.object or self.object.user != request.user: + if not self.object or self.object.name != request.name: return redirect("speaker:index") return super(SpeakerProfileUpdate, self).get(request, *args, **kwargs) def get_form_kwargs(self): kwargs = super(SpeakerProfileUpdate, self).get_form_kwargs() - kwargs.update({"user": self.request.user}) + kwargs.update({"name": self.request.name}) return kwargs diff --git a/templates/speaker/email/base_email.html b/templates/speaker/email/base_email.html new file mode 100644 index 00000000..a7ab3447 --- /dev/null +++ b/templates/speaker/email/base_email.html @@ -0,0 +1,8 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name %}Hello from {{ site_name }}!{% endblocktrans %} + +{% block content %}{% endblock content %} + +{% blocktrans with site_name=current_site.name site_domain=current_site.domain %} +

    Thank you for using {{ site_name }}!

    +

    {{ site_domain }}

    {% endblocktrans %} +{% endautoescape %} diff --git a/templates/speaker/email/base_email.txt b/templates/speaker/email/base_email.txt new file mode 100644 index 00000000..bf3f6eea --- /dev/null +++ b/templates/speaker/email/base_email.txt @@ -0,0 +1,8 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name %}Hello from {{ site_name }}!{% endblocktrans %} + +{% block content %}{% endblock content %} + +{% blocktrans with site_name=current_site.name site_domain=current_site.domain %} +Thank you for using {{ site_name }}! +{{ site_domain }}{% endblocktrans %} +{% endautoescape %} diff --git a/templates/speaker/email/speaker_profile_email_notification.html b/templates/speaker/email/speaker_profile_email_notification.html new file mode 100644 index 00000000..f2711ce0 --- /dev/null +++ b/templates/speaker/email/speaker_profile_email_notification.html @@ -0,0 +1,19 @@ +{% extends "speaker/email/base_email.html" %} +{% load i18n %} +{% block content %} +

    {{ profile.name }}, thank you for applying to speaker with us.

    + {% if updated %} +

    + Your speaker profile has recently been updated. +

    + {% endif %} +

    Your information:

    +
      +
    • Code: {{ profile.code }}
      • +
    • Name: {{ profile.name }}
      • +
    • Email: {{ profile.email }}
      • +
    +

    + Testing! +

    +{% endblock content %} diff --git a/templates/speaker/email/speaker_profile_email_notification.txt b/templates/speaker/email/speaker_profile_email_notification.txt new file mode 100644 index 00000000..e3dbb0c3 --- /dev/null +++ b/templates/speaker/email/speaker_profile_email_notification.txt @@ -0,0 +1,14 @@ +{% extends "account/email/base_message.txt" %} +{% load i18n %} +{% load account %} +{% block content %} +{{ profile.name }}, thank you for applying to speaker with us. + +Your current speaker application status: {{ profile.application_status }}. + +Your information: +- Code: {{ profile.code }} +- Name: {{ profile.name }} +- Email: {{ profile.email }} +If you would like to review or update your application at any time, go to your speaker Dashboard at https://{{ current_site.domain }}{% url 'volunteer:index' %}. +{% endblock content %} diff --git a/templates/speaker/index.html b/templates/speaker/index.html index 9e80a9b8..ddad4459 100644 --- a/templates/speaker/index.html +++ b/templates/speaker/index.html @@ -7,21 +7,7 @@

    Speaker Profile

    - {% if profile_id %} - View my Profile - Edit Profile - {% else %}

    - You have not created your Speaker Profile yet. Once you created your profile, our team will review it. - We will then assign you to the appropriate team that needs help so you can get set up with the - necessary access. + Speaker Module!

    - Create my Profile - {% endif %} {% endblock content %} diff --git a/templates/speaker/speakerprofile_detail.html b/templates/speaker/speakerprofile_detail.html index 439326cb..392ff2ed 100644 --- a/templates/speaker/speakerprofile_detail.html +++ b/templates/speaker/speakerprofile_detail.html @@ -7,216 +7,4 @@

    Your Speaker Profile

    -
    -
    -
    - Basic Information -
    -
    -
    -
    -
    - Username: -
    -
    - {{ object.user.username }} -
    -
    -
    -
    - Name: -
    -
    - {{ object.user.first_name }} {{ object.user.last_name }} -
    -
    -
    -
    - Email: -
    -
    - {{ object.user.email }} -
    -
    -
    -
    - Availability: -
    -
    -

    {{ object.availability_hours_per_week|default:0 }} hours per week

    -
    -
    -
    -
    - Region: -
    -
    - {{ object.region|default:"Not specified" }} -
    -
    -
    -
    - PyLadies Chapter: -
    -
    - {{ object.pyladies_chapter|default:"Not specified" }} -
    -
    -
    -
    - Application Status: -
    -
    - {{ object.application_status }} -
    -
    -
    -
    - Languages: -
    -
    - {% for language in object.languages_spoken %} - {{ language }} - {% endfor %} -
    -
    -
    -
    -
    -
    -
    - Teams & Roles -
    -
    -
    -
    -
    - Teams: -
    -
    - {% if object.teams.all %} - {% for team in object.teams.all %} - {{ team.short_name }} - {% endfor %} - {% else %} - Not assigned to any teams yet - {% endif %} -
    -
    -
    -
    - Roles: -
    -
    - {% if object.roles.all %} - {% for role in object.roles.all %} - {{ role.short_name }} - {% endfor %} - {% else %} - No roles assigned yet - {% endif %} -
    -
    -
    -
    -
    -
    -
    - Social Media -
    -
    -
    - {% if object.github_username or object.discord_username or object.instagram_username or object.bluesky_username or object.mastodon_url or object.x_username or object.linkedin_url %} - {% if object.github_username %} -
    -
    - GitHub: -
    -
    - {{ object.github_username }} -
    -
    - {% endif %} - {% if object.discord_username %} -
    -
    - Discord: -
    -
    - {{ object.discord_username }} -
    -
    - {% endif %} - {% if object.instagram_username %} -
    -
    - Instagram: -
    -
    - {{ object.instagram_username }} -
    -
    - {% endif %} - {% if object.bluesky_username %} -
    -
    - Bluesky: -
    -
    - {{ object.bluesky_username }} -
    -
    - {% endif %} - {% if object.mastodon_url %} -
    -
    - Mastodon: -
    -
    - {{ object.mastodon_url }} -
    -
    - {% endif %} - {% if object.x_username %} -
    -
    - X/Twitter: -
    -
    - {{ object.x_username }} -
    -
    - {% endif %} - {% if object.linkedin_url %} -
    -
    - LinkedIn: -
    -
    - {{ object.linkedin_url }} -
    -
    - {% endif %} - {% else %} -

    - No social media profiles added -

    - {% endif %} -
    -
    -
    -
    -
    - Additional Comments -
    -
    -
    -

    {{ object.additional_comments }}

    -
    -
    -
    - Edit Profile - Back to Speaker Dashboard -
    {% endblock content %} From df702156541f23881d873d0acc3189ec104c73c8 Mon Sep 17 00:00:00 2001 From: mkerostasia Date: Thu, 29 May 2025 06:41:52 -0400 Subject: [PATCH 4/6] fixing lint errors --- speaker/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/speaker/models.py b/speaker/models.py index cc068ccf..8ff9a697 100644 --- a/speaker/models.py +++ b/speaker/models.py @@ -71,8 +71,8 @@ class SpeakerProfile(BaseModel): locale = models.CharField(blank=True, null=True) has_arrived = models.BooleanField(blank=True, null=True) - submissions: [] - answers: [] + submissions: list[str] + answers: list[str] additional_comments = models.CharField(max_length=1000, blank=True, null=True) @@ -86,7 +86,7 @@ def clean(self): super().clean() def __str__(self): - return self.name + return str(self.name) def get_absolute_url(self): return reverse("speaker:speaker_profile_edit", kwargs={"pk": self.pk}) From 1140d727420ad4d60792747fd90392301824058d Mon Sep 17 00:00:00 2001 From: mkerostasia Date: Thu, 29 May 2025 06:42:29 -0400 Subject: [PATCH 5/6] update ignore to include encrypted env files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d37151d5..be10272d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ env/ .env.prod .env.prod.db .env +.env.enc # Coverage and state .coverage From 1711902bfc2247466d4ddbf90ce9c7b8cbad2801 Mon Sep 17 00:00:00 2001 From: mkerostasia Date: Thu, 29 May 2025 08:44:27 -0400 Subject: [PATCH 6/6] added Events and Load Event Speakers Button when superuser --- event/admin.py | 10 ++++++ {speaker => event}/api/__init__.py | 0 {speaker => event}/api/client.py | 0 {speaker => event}/api/pretalx.py | 4 +-- event/migrations/0001_initial.py | 34 ++++++++++++++++++++ event/migrations/__init__.py | 0 event/models.py | 7 ++++ event/urls.py | 15 +++++++++ event/views.py | 51 ++++++++++++++++++++++++++++++ portal/admin.py | 27 ++++++++++++++++ portal/settings.py | 1 + portal/urls.py | 1 + speaker/migrations/0001_initial.py | 6 ++-- speaker/models.py | 16 ++++------ speaker/views.py | 21 ++++++------ templates/event/index.html | 37 ++++++++++++++++++++++ 16 files changed, 206 insertions(+), 24 deletions(-) create mode 100644 event/admin.py rename {speaker => event}/api/__init__.py (100%) rename {speaker => event}/api/client.py (100%) rename {speaker => event}/api/pretalx.py (67%) create mode 100644 event/migrations/0001_initial.py create mode 100644 event/migrations/__init__.py create mode 100644 event/models.py create mode 100644 event/urls.py create mode 100644 event/views.py create mode 100644 portal/admin.py create mode 100644 templates/event/index.html diff --git a/event/admin.py b/event/admin.py new file mode 100644 index 00000000..753dd1a5 --- /dev/null +++ b/event/admin.py @@ -0,0 +1,10 @@ +from django.contrib import admin + +from .models import Event + +class EventAdmin(admin.ModelAdmin): + list_display = ("event_slug",) + search_fields = ("event_slug",) + # list_filter = ("region", "application_status") + +admin.site.register(Event, EventAdmin) diff --git a/speaker/api/__init__.py b/event/api/__init__.py similarity index 100% rename from speaker/api/__init__.py rename to event/api/__init__.py diff --git a/speaker/api/client.py b/event/api/client.py similarity index 100% rename from speaker/api/client.py rename to event/api/client.py diff --git a/speaker/api/pretalx.py b/event/api/pretalx.py similarity index 67% rename from speaker/api/pretalx.py rename to event/api/pretalx.py index a33f448d..c2d46f6e 100644 --- a/speaker/api/pretalx.py +++ b/event/api/pretalx.py @@ -3,8 +3,8 @@ PRETALX_BASE_URL="https://pretalx.com/api" EVENT_NAME="mayatest1-2025" -def fetch_event_speakers(): +def fetch_event_speakers(event_name: str): client = PretalxClient(base_url=PRETALX_BASE_URL) client.auth() - return client.get_speakers(EVENT_NAME) + return client.get_speakers(event_name) diff --git a/event/migrations/0001_initial.py b/event/migrations/0001_initial.py new file mode 100644 index 00000000..5106a933 --- /dev/null +++ b/event/migrations/0001_initial.py @@ -0,0 +1,34 @@ +# Generated by Django 5.1.8 on 2025-05-29 11:33 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ("portal", "0001_initial"), + ] + + operations = [ + migrations.CreateModel( + name="Event", + fields=[ + ( + "basemodel_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="portal.basemodel", + ), + ), + ("event_slug", models.CharField(blank=True)), + ], + bases=("portal.basemodel",), + ), + ] diff --git a/event/migrations/__init__.py b/event/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/event/models.py b/event/models.py new file mode 100644 index 00000000..659a236a --- /dev/null +++ b/event/models.py @@ -0,0 +1,7 @@ +from django.db import models + +from portal.models import BaseModel + +class Event(BaseModel): + event_slug = models.CharField(blank=True, null=False) + diff --git a/event/urls.py b/event/urls.py new file mode 100644 index 00000000..633eaf66 --- /dev/null +++ b/event/urls.py @@ -0,0 +1,15 @@ +from django.contrib.auth.decorators import login_required +from django.urls import path + +from . import views + +app_name = "speaker" + +urlpatterns = [ + path("", views.index, name="index"), + path( + "load-speakers", + login_required(views.load_speakers), + name="speaker-load", + ), +] diff --git a/event/views.py b/event/views.py new file mode 100644 index 00000000..914b6328 --- /dev/null +++ b/event/views.py @@ -0,0 +1,51 @@ +from django.contrib.auth.decorators import login_required +from django.shortcuts import render +from django.http import HttpResponse + +from .models import Event +from speaker.models import SpeakerProfile + + +### +# # Fetch Pretalx Speakers +### +from .api.pretalx import fetch_event_speakers + +def pull_event_speakers(event_slug): + speaker_results = fetch_event_speakers(event_slug) + print(speaker_results) + for speaker in speaker_results['results']: + print(speaker) + return speaker_results['results'] + +def create_speakers(speakers: list[dict]): + for speaker in speakers: + already_created = SpeakerProfile.objects.filter(code__contains=speaker.get('code')) + if len(already_created) == 0: + SpeakerProfile.objects.create(**speaker) + else: + print("Speaker already Created") + print(already_created.first()) + + print(SpeakerProfile.objects.count()) + + +@login_required +def index(request): + context = {} + event = Event.objects.first() + if event: + context["event_slug"] = event.event_slug + else: + context["event_slug"] = None + return render(request, "event/index.html", context) + + +@login_required +def load_speakers(request): + # context = {} + events = Event.objects.all() + for event in events: + pull_event_speakers(event.event_slug) + return HttpResponse("") + diff --git a/portal/admin.py b/portal/admin.py new file mode 100644 index 00000000..635c54d9 --- /dev/null +++ b/portal/admin.py @@ -0,0 +1,27 @@ +from django.contrib import admin + +class AdminExtension(admin.AdminSite): + def get_app_list(self, request, app_label=None): + app_list = super().get_app_list(request, app_label) + app_list += [ + { + "name": "Events/Speaker Management", + "app_label": "prtlx_mgmt", + "models": [ + { + "name": "event", + "object_name": "event", + "admin_url": "/admin/event", + "view_only": True + }, + { + "name": "speaker", + "object_name": "speaker", + "admin_url": "/admin/speaker", + "view_only": True + } + ] + } + ] + + return app_list diff --git a/portal/settings.py b/portal/settings.py index 047846ed..fe3ca0ea 100644 --- a/portal/settings.py +++ b/portal/settings.py @@ -49,6 +49,7 @@ "portal", "volunteer", "speaker", + "event", "portal_account", "widget_tweaks", ] diff --git a/portal/urls.py b/portal/urls.py index be03e8db..ffbdf6ea 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -27,6 +27,7 @@ path("", views.index, name="index"), path("volunteer/", include("volunteer.urls", namespace="volunteer")), path("speaker/", include("speaker.urls", namespace="speaker")), + path("event/", include("event.urls", namespace="event")), path("admin/", admin.site.urls), path("accounts/", include("allauth.urls")), path( diff --git a/speaker/migrations/0001_initial.py b/speaker/migrations/0001_initial.py index 35bf961f..e9564f2f 100644 --- a/speaker/migrations/0001_initial.py +++ b/speaker/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.1.8 on 2025-05-20 18:11 +# Generated by Django 5.1.8 on 2025-05-29 11:33 import django.db.models.deletion import speaker.constants @@ -53,7 +53,7 @@ class Migration(migrations.Migration): max_length=50, ), ), - ("code", models.CharField(blank=True)), + ("code", models.CharField(blank=True, unique=True)), ("name", models.CharField(blank=True, null=True)), ("biography", models.CharField(blank=True, null=True)), ("avatar_url", models.CharField(blank=True, null=True)), @@ -61,6 +61,8 @@ class Migration(migrations.Migration): ("timezone", models.CharField(blank=True, null=True)), ("locale", models.CharField(blank=True, null=True)), ("has_arrived", models.BooleanField(blank=True, null=True)), + ("submissions", models.JSONField(blank=True, null=True)), + ("answers", models.JSONField(blank=True, null=True)), ( "additional_comments", models.CharField(blank=True, max_length=1000, null=True), diff --git a/speaker/models.py b/speaker/models.py index 8ff9a697..d237d4fb 100644 --- a/speaker/models.py +++ b/speaker/models.py @@ -1,9 +1,7 @@ import re from django.conf import settings -from django.contrib.auth.models import User from django.contrib.sites.models import Site -from django.core.exceptions import ValidationError from django.core.mail import EmailMultiAlternatives from django.db import models from django.db.models.signals import post_save @@ -11,7 +9,7 @@ from django.template.loader import render_to_string from django.urls import reverse -from portal.models import BaseModel, ChoiceArrayField +from portal.models import BaseModel from .constants import ApplicationStatus, Region from .languages import LANGUAGES @@ -34,9 +32,6 @@ ] -class Event(BaseModel): - event_slug = models.CharField(blank=True, null=False) - # # Pretalx Data # { # "code": "WPSKUD", @@ -55,6 +50,8 @@ class Event(BaseModel): class SpeakerProfile(BaseModel): + # Identification + # id = models.AutoField() application_status = models.CharField( max_length=50, choices=APPLICATION_STATUS_CHOICES, @@ -62,7 +59,7 @@ class SpeakerProfile(BaseModel): ) # Pretalx Data - code = models.CharField(blank=True, null=False) + code = models.CharField(blank=True, null=False, unique=True) name = models.CharField(blank=True, null=True) biography = models.CharField(blank=True, null=True) avatar_url = models.CharField(blank=True, null=True) @@ -70,9 +67,8 @@ class SpeakerProfile(BaseModel): timezone = models.CharField(blank=True, null=True) locale = models.CharField(blank=True, null=True) has_arrived = models.BooleanField(blank=True, null=True) - - submissions: list[str] - answers: list[str] + submissions = models.JSONField(blank=True, null=True) + answers = models.JSONField(blank=True, null=True) additional_comments = models.CharField(max_length=1000, blank=True, null=True) diff --git a/speaker/views.py b/speaker/views.py index 3b5cd149..b92c62f6 100644 --- a/speaker/views.py +++ b/speaker/views.py @@ -2,29 +2,30 @@ from django.shortcuts import redirect, render from django.urls import reverse_lazy from django.views.generic import DetailView, ListView -from django.views.generic.edit import CreateView, DeleteView, UpdateView +from django.views.generic.edit import DeleteView, UpdateView from .forms import SpeakerProfileForm from .models import SpeakerProfile -from .api.pretalx import fetch_event_speakers +# from .api.pretalx import fetch_event_speakers -def pull_event_speakers(event_slug): - speaker_results = fetch_event_speakers() - print(speaker_results) - for speaker in speaker_results['results']: - print(speaker) +# def pull_event_speakers(event_slug): +# speaker_results = fetch_event_speakers() +# print(speaker_results) +# for speaker in speaker_results['results']: +# print(speaker) +# return speaker_results['results'] @login_required def index(request): context = {} - print(request) try: profile = SpeakerProfile.objects.first() - context["profile_id"] = profile.id - pull_event_speakers("mayatest1-2025") + if profile: + context["profile_id"] = profile.id except SpeakerProfile.DoesNotExist: context["profile_id"] = None + return render(request, "speaker/index.html", context) class SpeakerProfileList(ListView): diff --git a/templates/event/index.html b/templates/event/index.html new file mode 100644 index 00000000..88901fb3 --- /dev/null +++ b/templates/event/index.html @@ -0,0 +1,37 @@ +{% extends "portal/base.html" %} +{% load allauth i18n %} +{% load django_bootstrap5 %} +{% block body %} +{% endblock body %} +{% block content %} + + + + + + + + + + + + + +

    + Events +

    +

    + Event Module! +

    + {% if user.is_superuser %} + + {% endif %} +{% endblock content %}