From 3a0efe3eebb7aec2a709d15d37f55aa827e62874 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 9 Jun 2022 18:54:58 -0500 Subject: [PATCH] clean up merge --- .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ teamsnap/dashboard/urls.py | 3 ++- teamsnap/urls.py | 4 +--- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..cc5462d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + 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/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/",