diff --git a/config/django/local.py b/config/django/local.py index 49179b8..c3127c9 100644 --- a/config/django/local.py +++ b/config/django/local.py @@ -3,6 +3,8 @@ from config.env import env SECRET_KEY = env('SECRET_KEY') DEBUG = env.bool('DEBUG', default=True) -ALLOWED_HOSTS = env.list('ALLOWED_HOSTS') +# ALLOWED_HOSTS = env.list('ALLOWED_HOSTS') +ALLOWED_HOSTS=['localhost',] CORS_ALLOW_ALL_ORIGINS = env.bool('CORS_ALLOW_ALL_ORIGINS') -CORS_ALLOWED_ORIGINS=env.list('CORS_ALLOWED_ORIGINS') \ No newline at end of file +# CORS_ALLOWED_ORIGINS=env.list('CORS_ALLOWED_ORIGINS') +CORS_ALLOWED_ORIGINS=['http://localhost:5173', 'https://digisnaxx.com'] \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index 6978172..d68e2eb 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/events/migrations/0029_remove_event_show_day_organization_business_email_and_more.py b/events/migrations/0029_remove_event_show_day_organization_business_email_and_more.py new file mode 100644 index 0000000..2dd30c5 --- /dev/null +++ b/events/migrations/0029_remove_event_show_day_organization_business_email_and_more.py @@ -0,0 +1,54 @@ +# Generated by Django 5.1.1 on 2025-10-12 17:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0028_event_live_alter_event_event_type'), + ] + + operations = [ + migrations.RemoveField( + model_name='event', + name='show_day', + ), + migrations.AddField( + model_name='organization', + name='business_email', + field=models.CharField(blank=True, max_length=63, null=True), + ), + migrations.AddField( + model_name='organization', + name='latitude', + field=models.FloatField(default=0), + preserve_default=False, + ), + migrations.AddField( + model_name='organization', + name='longitude', + field=models.FloatField(default=0), + preserve_default=False, + ), + migrations.AlterField( + model_name='event', + name='img_link', + field=models.URLField(blank=True, max_length=255, null=True), + ), + migrations.AlterField( + model_name='event', + name='tags', + field=models.ManyToManyField(blank=True, to='events.tags'), + ), + migrations.AlterField( + model_name='organization', + name='tags', + field=models.ManyToManyField(blank=True, to='events.tags'), + ), + migrations.AlterField( + model_name='promo', + name='tags', + field=models.ManyToManyField(blank=True, to='events.tags'), + ), + ] diff --git a/events/models.py b/events/models.py index ac2934c..502aeb0 100644 --- a/events/models.py +++ b/events/models.py @@ -62,29 +62,34 @@ class Organization(models.Model): ('Se', 'Service'), ('Ud', 'Undefined'), ) + name = models.CharField(max_length=63) website = models.CharField(max_length=126, blank=True, null=True) membership = models.CharField(max_length=31, choices=MEMBER_TYPE, default='0') org_type = models.CharField(max_length=31, choices=ORG_TYPE, default='3') - stripe_email = models.CharField(max_length=63, blank=True, null=True) - ein = models.CharField(max_length=15, blank=True, null=True) - is_venue= models.BooleanField(default=False) - is_501c = models.BooleanField(default=False) - short_desc = models.CharField(max_length=63, blank=True, null=True) long_desc = models.TextField(blank=True, null=True) + tags = models.ManyToManyField(Tags, blank=True) - contact_name = models.CharField(max_length=63, blank=True, null=True) - contact_email = models.CharField(max_length=63, blank=True, null=True) - - phone_number = models.CharField(max_length=255, blank=True, null=True) address = models.CharField(max_length=63, blank=True, null=True) city = models.CharField(max_length=31, blank=True, null=True) state = models.CharField(max_length=15, blank=True, null=True) zip_code = models.CharField(max_length=15, blank=True, null=True) - tags = models.ManyToManyField(Tags, blank=True, null=True) + phone_number = models.CharField(max_length=255, blank=True, null=True) + business_email = models.CharField(max_length=63, blank=True, null=True) + + is_venue= models.BooleanField(default=False) + is_501c = models.BooleanField(default=False) + + latitude = models.FloatField() + longitude = models.FloatField() + + contact_name = models.CharField(max_length=63, blank=True, null=True) + contact_email = models.CharField(max_length=63, blank=True, null=True) + stripe_email = models.CharField(max_length=63, blank=True, null=True) + ein = models.CharField(max_length=15, blank=True, null=True) class Meta: unique_together = ("name", "is_venue") @@ -115,21 +120,24 @@ class Event(models.Model): ('virt', 'Virtually Served'), ('both', 'How you prefer.') ) + + show_title = models.CharField(max_length=127, blank=True, null=True) + show_link = models.URLField(blank=True, null=True) + show_date = models.DateTimeField() + calendar = models.ForeignKey(Calendar, on_delete=models.CASCADE, blank=True, null=True) scraper = models.ForeignKey(Scraper, on_delete=models.CASCADE, null=True) venue = models.ForeignKey(Organization, on_delete=models.CASCADE) + live = models.CharField(max_length=4, choices=EVENT_STATE, default='live') event_type = models.CharField(max_length=15, choices=EVENT_TYPE, default='Mu') - show_title = models.CharField(max_length=127, blank=True, null=True) - show_link = models.URLField(blank=True, null=True) - guests = models.CharField(max_length=255, blank=True, null=True) - show_date = models.DateTimeField() - show_day = models.DateField(blank=True, null=True) - img_link = models.CharField(max_length=255, blank=True, null=True) - flyer_img = models.ImageField(upload_to=fs, blank=True, null=True) - more_details = models.JSONField(blank=True, null=True) - tags = models.ManyToManyField(Tags, blank=True, null=True) + img_link = models.URLField(max_length=255, blank=True, null=True) + flyer_img = models.ImageField(upload_to=fs, blank=True, null=True) + + guests = models.CharField(max_length=255, blank=True, null=True) + more_details = models.JSONField(blank=True, null=True) + tags = models.ManyToManyField(Tags, blank=True) class Meta: verbose_name_plural = "Events" @@ -157,6 +165,7 @@ class Promo(models.Model): ('Ja', 'Journal Article'), ('Su', 'Survey Questions') ) + title = models.CharField(max_length=63) organization = models.ForeignKey(Organization, on_delete=models.CASCADE) promo_type = models.CharField(max_length=15, choices=PROMO_TYPE, default='0') @@ -169,7 +178,7 @@ class Promo(models.Model): notes = models.TextField(blank=True, null=True) published = models.BooleanField(default=False) - tags = models.ManyToManyField(Tags, blank=True, null=True) + tags = models.ManyToManyField(Tags, blank=True) class Meta: verbose_name_plural = "Promo" diff --git a/socials/views.py b/socials/views.py index a1ad8bf..b559000 100644 --- a/socials/views.py +++ b/socials/views.py @@ -45,6 +45,11 @@ class SocialLinksAPIView(generics.ListAPIView): queryset = SocialLink.objects.all()[:50] permission_classes = [HasAPIKey] + def get_queryset(self): + social_links = list(SocialLink.objects.all()[:96]) + queryset = random.sample(social_links, 32) + return queryset + class SocialImgsAPIView(generics.ListAPIView): serializer_class = SocialImgsSerializer