resolve merge conflicts

2022-06-10 08:59:22 -05:00
parent cd4257f13e 3a0efe3eeb
commit e4899d2494
126 changed files with 1459 additions and 299 deletions
--- a/teamsnap/models.py
+++ b/teamsnap/models.py
@@ -12,3 +12,43 @@ class Preferences(models.Model):

    class Meta:
        verbose_name_plural = "preferences"
+
+
+class Team(models.Model):
+    id = models.IntegerField(primary_key=True)
+    logo = models.ImageField(
+        upload_to="logos",
+        height_field=None,
+        width_field=None,
+        max_length=100,
+        null=True,
+        blank=True,
+    )
+    logo_mono = models.ImageField(
+        upload_to="logos_mono",
+        height_field=None,
+        width_field=None,
+        max_length=100,
+        null=True,
+        blank=True,
+    )
+
+
+class Opponent(models.Model):
+    id = models.IntegerField(primary_key=True)
+    logo = models.ImageField(
+        upload_to="logos",
+        height_field=None,
+        width_field=None,
+        max_length=100,
+        null=True,
+        blank=True,
+    )
+    logo_mono = models.ImageField(
+        upload_to="logos_mono",
+        height_field=None,
+        width_field=None,
+        max_length=100,
+        null=True,
+        blank=True,
+    )