Revert "Tried pulling from main branch"

This reverts commit 8c942c0.

Author: SafetyInObscurity

server/api/settings.py

@@ -30,7 +30,6 @@
 SECRET_KEY = os.environ.get("API_SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-# export APP_ENV=DEVELOPMENT
 DEBUG = os.environ.get("APP_ENV") == "DEVELOPMENT"
 
 ALLOWED_HOSTS = (
@@ -66,8 +65,6 @@
     "corsheaders.middleware.CorsMiddleware",
 ]
 
-
-# export FRONTEND_URL=http://localhost:3000
 CORS_ALLOWED_ORIGINS = [
     "http://localhost:3000",
     "http://127.0.0.1:3000",

…_member_profile_picture_game_and_more.py …ate_game_gameshowcase_gamecontributor.pyserver/game_dev/migrations/0005_committee_alter_member_profile_picture_game_and_more.py renamed to server/game_dev/migrations/0005_alter_event_date_game_gameshowcase_gamecontributor.py server/game_dev/migrations/0005_committee_alter_member_profile_picture_game_and_more.py renamed to server/game_dev/migrations/0005_alter_event_date_game_gameshowcase_gamecontributor.py

@@ -1,6 +1,7 @@
-# Generated by Django 5.1.14 on 2026-02-07 07:47
+# Generated by Django 5.1.14 on 2026-01-24 06:27
 
 import django.db.models.deletion
+import django.db.models.functions.datetime
 from django.db import migrations, models
 
 
@@ -11,42 +12,12 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.CreateModel(
-            name="Committee",
-            fields=[
-                (
-                    "id",
-                    models.OneToOneField(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        primary_key=True,
-                        serialize=False,
-                        to="game_dev.member",
-                    ),
-                ),
-                (
-                    "role",
-                    models.CharField(
-                        choices=[
-                            ("P", "President"),
-                            ("VP", "Vice-President"),
-                            ("SEC", "Secretary"),
-                            ("TRE", "Treasurer"),
-                            ("MARK", "Marketing"),
-                            ("EV", "Events OCM"),
-                            ("PRO", "Projects OCM"),
-                            ("FRE", "Fresher Rep"),
-                        ],
-                        default="FRE",
-                        max_length=9,
-                        unique=True,
-                    ),
-                ),
-            ],
-        ),
         migrations.AlterField(
-            model_name="member",
-            name="profile_picture",
-            field=models.ImageField(blank=True, null=True, upload_to="profiles/"),
+            model_name="event",
+            name="date",
+            field=models.DateTimeField(
+                db_default=django.db.models.functions.datetime.Now()
+            ),
         ),
         migrations.CreateModel(
             name="Game",
@@ -75,17 +46,18 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("active", models.BooleanField(default=True)),
-                ("hostURL", models.URLField(max_length=2083)),
+                ("hostURL", models.CharField(max_length=2083)),
+                ("isItch", models.BooleanField(default=True)),
                 (
                     "itchEmbedID",
                     models.PositiveIntegerField(
                         blank=True,
                         default=None,
-                        help_text="If game is stored on itch.io, please enter the itchEmbedID, i.e., 1000200",
+                        help_text="If game is stored on itch.io, please enter the 7 digit long game id as its itchEmbedID, i.e., 1000200",
                         null=True,
                     ),
                 ),
-                ("thumbnail", models.ImageField(null=True, upload_to="games/")),
+                ("pathToThumbnail", models.ImageField(null=True, upload_to="games/")),
                 (
                     "event",
                     models.ForeignKey(
@@ -116,7 +88,6 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="game_showcases",
                         to="game_dev.game",
-                        unique=True,
                     ),
                 ),
             ],

server/game_dev/migrations/0005_alter_member_profile_picture.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.15 on 2026-01-18 15:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("game_dev", "0004_alter_event_date"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="member",
+            name="profile_picture",
+            field=models.ImageField(blank=True, null=True, upload_to="profiles/"),
+        ),
+    ]

server/game_dev/migrations/0005_committee.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.15 on 2026-01-09 09:46
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0004_alter_event_date'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Committee',
+            fields=[
+                ('id', models.OneToOneField(on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='game_dev.member')),
+            ],
+        ),
+    ]

server/game_dev/migrations/0006_alter_gameshowcase_game.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.15 on 2026-01-09 09:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0005_committee'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='committee',
+            name='role',
+            field=models.CharField(choices=[('P', 'President'), ('VP', 'Vice-President'), ('SEC', 'Secretary'),
+                                            ('TRE', 'Treasurer'), ('MARK', 'Marketing'), ('EV', 'Events OCM'),
+                                            ('PRO', 'Projects OCM'), ('FRE', 'Fresher Rep')], default='FRE', max_length=9),
+        ),
+    ]

server/game_dev/migrations/0006_committee_role.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.14 on 2026-01-24 07:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("game_dev", "0005_alter_event_date_game_gameshowcase_gamecontributor"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="game",
+            name="isItch",
+        ),
+        migrations.AlterField(
+            model_name="game",
+            name="itchEmbedID",
+            field=models.PositiveIntegerField(
+                blank=True,
+                default=None,
+                help_text="If game is stored on itch.io, please enter the itchEmbedID, i.e., 1000200",
+                null=True,
+            ),
+        ),
+    ]

server/game_dev/migrations/0006_remove_game_isitch_alter_game_itchembedid.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.15 on 2026-01-21 07:59
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0006_committee_role'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='committee',
+            name='id',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='game_dev.member'),
+        ),
+    ]

server/game_dev/migrations/0007_alter_committee_id.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.14 on 2026-01-24 07:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("game_dev", "0006_remove_game_isitch_alter_game_itchembedid"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="game",
+            old_name="pathToThumbnail",
+            new_name="thumbnail",
+        ),
+        migrations.AlterField(
+            model_name="game",
+            name="hostURL",
+            field=models.URLField(max_length=2083),
+        ),
+    ]

server/game_dev/migrations/0007_rename_pathtothumbnail_game_thumbnail_and_more.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.15 on 2026-01-21 08:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0007_alter_committee_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='committee',
+            name='role',
+            field=models.CharField(choices=[('P', 'President'), ('VP', 'Vice-President'), ('SEC', 'Secretary'),
+                                            ('TRE', 'Treasurer'), ('MARK', 'Marketing'), ('EV', 'Events OCM'),
+                                            ('PRO', 'Projects OCM'), ('FRE', 'Fresher Rep')], default='FRE', max_length=9, unique=True),
+        ),
+    ]