Merge branch 'v2' into v2-gamechanger

# Conflicts:
#	config/settings/base.py
#	setup.cfg
#	teamsnap/migrations/0001_initial.py

teamsnap/dashboard/views.py

@@ -8,7 +8,8 @@ from teamsnap.views import get_teamsnap_client
 def dashboard(request, team_id=None):
     if not team_id:
         return redirect(
-            "teamsnap_dashboard", team_id=request.user.preferences.managed_team_id
+            "teamsnap_dashboard",
+            team_id=request.user.teamsnap_preferences.managed_team_id,
         )
 
     from pyteamsnap.api import AvailabilitySummary, Event

teamsnap/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2022-06-10 14:00
+# Generated by Django 3.2.13 on 2022-06-09 23:57
 
 from django.conf import settings
 from django.db import migrations, models
@@ -35,10 +35,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('managed_team_id', models.IntegerField()),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_preferences', to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-                'verbose_name_plural': 'preferences',
-            },
         ),
     ]

teamsnap/migrations/0004_auto_20220609_0722.py

@@ -1,33 +0,0 @@
-# Generated by Django 3.2.13 on 2022-06-09 12:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('teamsnap', '0003_auto_20220609_0721'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='opponent',
-            name='logo',
-            field=models.ImageField(blank=True, null=True, upload_to='logos'),
-        ),
-        migrations.AlterField(
-            model_name='opponent',
-            name='logo_mono',
-            field=models.ImageField(blank=True, null=True, upload_to='logos_mono'),
-        ),
-        migrations.AlterField(
-            model_name='team',
-            name='logo',
-            field=models.ImageField(blank=True, null=True, upload_to='logos'),
-        ),
-        migrations.AlterField(
-            model_name='team',
-            name='logo_mono',
-            field=models.ImageField(blank=True, null=True, upload_to='logos_mono'),
-        ),
-    ]