diff --git a/config/settings/base.py b/config/settings/base.py index 47189c3..d58ab24 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -272,5 +272,11 @@ SOCIALACCOUNT_FORMS = {"signup": "benchcoach.users.forms.UserSocialSignupForm"} # Your stuff... # ------------------------------------------------------------------------------ -INSTALLED_APPS += ["teamsnap", "instagen", "teamsnap.lineup", "teamsnap.dashboard"] +INSTALLED_APPS += [ + "teamsnap", + "instagen", + "gamecard", + "teamsnap.lineup", + "teamsnap.dashboard", +] SOCIALACCOUNT_PROVIDERS = {"teamsnap": {"SCOPE": ["read", "write"]}} diff --git a/teamsnap/dashboard/urls.py b/teamsnap/dashboard/urls.py index 22b0d55..3c97730 100644 --- a/teamsnap/dashboard/urls.py +++ b/teamsnap/dashboard/urls.py @@ -1,5 +1,6 @@ from django.urls import path -from views import dashboard + +from .views import dashboard urlpatterns = [ path("/dashboard/", dashboard, name="teamsnap_dashboard"), diff --git a/teamsnap/migrations/0001_initial.py b/teamsnap/migrations/0001_initial.py index 9a9aaea..9818a15 100644 --- a/teamsnap/migrations/0001_initial.py +++ b/teamsnap/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.13 on 2022-06-09 12:09 +# Generated by Django 3.2.13 on 2022-06-09 23:57 from django.conf import settings from django.db import migrations, models @@ -15,33 +15,27 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='Team', + name='Opponent', fields=[ ('id', models.IntegerField(primary_key=True, serialize=False)), - ('logo', models.ImageField(upload_to='logos')), - ('logo_mono', models.ImageField(upload_to='logos_mono')), + ('logo', models.ImageField(blank=True, null=True, upload_to='logos')), + ('logo_mono', models.ImageField(blank=True, null=True, upload_to='logos_mono')), ], ), migrations.CreateModel( - name="Preferences", + name='Team', 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, - to=settings.AUTH_USER_MODEL, - ), - ), + ('id', models.IntegerField(primary_key=True, serialize=False)), + ('logo', models.ImageField(blank=True, null=True, upload_to='logos')), + ('logo_mono', models.ImageField(blank=True, null=True, upload_to='logos_mono')), + ], + ), + migrations.CreateModel( + name='Preferences', + 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, to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/teamsnap/migrations/0004_auto_20220609_0722.py b/teamsnap/migrations/0004_auto_20220609_0722.py deleted file mode 100644 index c74d7fa..0000000 --- a/teamsnap/migrations/0004_auto_20220609_0722.py +++ /dev/null @@ -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'), - ), - ] diff --git a/teamsnap/urls.py b/teamsnap/urls.py index 3a34725..22cf9cd 100644 --- a/teamsnap/urls.py +++ b/teamsnap/urls.py @@ -2,15 +2,13 @@ from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns from django.urls import include, path from .provider import TeamsnapProvider -from .views import PreferencesFormView, dashboard, schedule_view, view_event +from .views import PreferencesFormView, schedule_view, view_event urlpatterns = default_urlpatterns(TeamsnapProvider) urlpatterns += [ path("preferences/", PreferencesFormView.as_view(), name="teamsnap_preferences"), path("/schedule/", schedule_view, name="teamsnap_schedule"), - path("/dashboard/", dashboard, name="teamsnap_dashboard"), - path("dashboard/", dashboard, name="teamsnap_dashboard"), path("schedule/", schedule_view, name="teamsnap_schedule"), path( "/schedule/view_event/",