Skip to content

Commit

Permalink
Resolved issues with PR
Browse files Browse the repository at this point in the history
  • Loading branch information
kenanwright1988 committed Oct 4, 2024
1 parent 4a27547 commit 48a0c6a
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 391 deletions.
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# version: "3.4"

services:
hackathon-app:
image: hackathon-app
Expand Down
10 changes: 3 additions & 7 deletions hackathon/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,25 +232,21 @@ class EventForm(forms.ModelForm):
label="Description",
widget=forms.Textarea(attrs={'rows': 4, 'class': 'form-control'})
)
isReadOnly = forms.BooleanField(
label="Read Only",
required=False,
widget=forms.CheckboxInput(attrs={'class': 'form-check-input'})
)
webinar_link = forms.URLField(
label="Webinar Link",
required=False,
widget=forms.URLInput(attrs={'class': 'form-control'})
)
webinar_code = forms.CharField(
label="Webinar Join Code",
required=False,
widget=forms.Textarea(attrs={'rows': 1, 'class': 'form-control'})
)
class Meta:
model = Event
fields = [
'title', 'start', 'end', 'body',
'isReadOnly', 'webinar_link',
'title', 'start', 'end', 'body',
'webinar_link',
'webinar_code',
]

Expand Down
23 changes: 0 additions & 23 deletions hackathon/migrations/0049_event.py

This file was deleted.

18 changes: 0 additions & 18 deletions hackathon/migrations/0050_auto_20240510_1722.py

This file was deleted.

42 changes: 0 additions & 42 deletions hackathon/migrations/0051_auto_20240510_1728.py

This file was deleted.

23 changes: 0 additions & 23 deletions hackathon/migrations/0052_auto_20240516_1847.py

This file was deleted.

31 changes: 0 additions & 31 deletions hackathon/migrations/0053_auto_20240516_1850.py

This file was deleted.

28 changes: 28 additions & 0 deletions hackathon/migrations/0054_event.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 3.1.13 on 2024-10-04 15:52

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('hackathon', '0053_auto_20240912_1527'),
]

operations = [
migrations.CreateModel(
name='Event',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200)),
('start', models.DateTimeField()),
('end', models.DateTimeField()),
('body', models.TextField(default='', max_length=500)),
('isReadOnly', models.BooleanField(default=True)),
('webinar_link', models.URLField(blank=True, null=True)),
('webinar_code', models.CharField(blank=True, max_length=50, null=True)),
('hackathon', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='events', to='hackathon.hackathon')),
],
),
]
18 changes: 0 additions & 18 deletions hackathon/migrations/0054_event_category.py

This file was deleted.

18 changes: 0 additions & 18 deletions hackathon/migrations/0055_auto_20240516_2100.py

This file was deleted.

18 changes: 0 additions & 18 deletions hackathon/migrations/0056_event_google_calendar_link.py

This file was deleted.

23 changes: 0 additions & 23 deletions hackathon/migrations/0057_auto_20240910_2006.py

This file was deleted.

18 changes: 0 additions & 18 deletions hackathon/migrations/0058_auto_20240910_2008.py

This file was deleted.

21 changes: 0 additions & 21 deletions hackathon/migrations/0059_auto_20240910_2010.py

This file was deleted.

20 changes: 0 additions & 20 deletions hackathon/migrations/0060_event_hackathon.py

This file was deleted.

17 changes: 0 additions & 17 deletions hackathon/migrations/0061_remove_event_calendar_id.py

This file was deleted.

17 changes: 0 additions & 17 deletions hackathon/migrations/0062_remove_event_category.py

This file was deleted.

Loading

0 comments on commit 48a0c6a

Please sign in to comment.