url namespace cleanup

apps/accounts/urls.py

@@ -2,6 +2,8 @@ from django.urls import path
 
 from . import views
 
+app_name = "accounts"
+
 urlpatterns = [
     path("login/", views.LoginView.as_view(), name="login"),
     path("logout/", views.logout, name="logout"),

apps/api/urls/__init__.py

@@ -7,9 +7,11 @@ from drf_spectacular.views import (
     SpectacularSwaggerView,
 )
 
+app_name = "api"
+
 urlpatterns = [
-    path("v1/", include(("apps.api.urls.v1", "v1"), namespace="v1")),
-    path("v2/", include(("apps.api.urls.v2", "v2"), namespace="v2")),
+    path("v1/", include("apps.api.urls.v1")),
+    path("v2/", include("apps.api.urls.v2")),
     path("schema/", SpectacularAPIView.as_view(), name="schema"),
     path("docs/", SpectacularSwaggerView.as_view(url_name="api:schema")),
     path("redoc/", SpectacularRedocView.as_view(url_name="api:schema")),

apps/api/urls/v1.py

@@ -3,6 +3,8 @@ from rest_framework.urlpatterns import format_suffix_patterns
 
 from apps.questionnaire.api import views
 
+app_name = "v1"
+
 urlpatterns = [
     path(
         "questionnaires/",

apps/api/urls/v2.py

@@ -5,6 +5,8 @@ from apps.api import views as api_views
 from apps.configuration.api import views as configuration_views
 from apps.questionnaire.api import views as questionnaire_views
 
+app_name = "v2"
+
 urlpatterns = {
     path(
         "questionnaires/",

apps/approaches/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.questionnaire import views
 from . import views as approach_views
 
+app_name = "approaches"
+
 urlpatterns = [
     # The 'home' route points to the list
     path(

apps/cbp/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.questionnaire import views
 from . import views as cbp_views
 
+app_name = "cbp"
+
 urlpatterns = [
     # The 'home' route points to the list
     path(

apps/cca/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.questionnaire import views
 from . import views as cca_views
 
+app_name = "cca"
+
 urlpatterns = [
     # The 'home' route points to the list
     path(

apps/configuration/urls.py

@@ -2,6 +2,8 @@ from django.urls import path
 
 from .views import EditionNotesView
 
+app_name = "configuration"
+
 urlpatterns = [
     # The 'home' route points to the list
     path("", EditionNotesView.as_view(), name="release_notes"),

apps/qcat/urls.py

+from django.urls import path
+from django.views.generic import TemplateView
+
+from apps.qcat import views
+
+urlpatterns = [
+    path("", views.about, name="about"),
+    path(
+        "imprint/",
+        TemplateView.as_view(template_name="qcat/imprint.html"),
+        name="imprint",
+    ),
+    path(
+        "terms-of-agreement/",
+        TemplateView.as_view(template_name="qcat/terms-of-agreement.html"),
+        name="terms-of-agreement",
+    ),
+    path(
+        "privacy-policy/",
+        TemplateView.as_view(template_name="qcat/privacy-policy.html"),
+        name="privacy-policy",
+    ),
+]

apps/questionnaire/urls.py

@@ -12,5 +12,5 @@ urlpatterns = [
     ),
     path("geo/", views.get_places, name="slm_places"),
     path("update/", views.get_places, name="update_slm_places"),
-    path("", include(("apps.sample.urls", "sample"), namespace="sample")),
+    path("", include("apps.sample.urls")),
 ]

apps/sample/urls.py

@@ -5,6 +5,8 @@ from django.views.generic import TemplateView
 from apps.questionnaire import views
 from . import views as sample_views
 
+app_name = "sample"
+
 urlpatterns = [
     path("", TemplateView.as_view(template_name="sample/home.html"), name="home"),
     path(

apps/samplemodule/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.questionnaire import views
 from . import views as samplemodule_views
 
+app_name = "samplemodule"
+
 urlpatterns = [
     path(
         "view/<identifier>/",

apps/samplemulti/urls.py

@@ -4,6 +4,8 @@ from django.views.generic import TemplateView
 from apps.questionnaire import views
 from . import views as samplemulti_views
 
+app_name = "samplemulti"
+
 urlpatterns = [
     path("", TemplateView.as_view(template_name="samplemulti/home.html"), name="home"),
     path(

apps/search/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.configuration import views as configuration_views
 from . import views
 
+app_name = "search"
+
 urlpatterns = [
     path("admin/", views.admin, name="admin"),
     path("delete/", views.delete_all, name="delete_all"),

apps/technologies/urls.py

@@ -5,6 +5,8 @@ from django.views.generic import TemplateView
 from apps.questionnaire import views
 from . import views as technologies_views
 
+app_name = "technologies"
+
 urlpatterns = [
     # The 'home' route points to the list
     path(

apps/unccd/urls.py

@@ -4,6 +4,8 @@ from django.views.generic import RedirectView
 from apps.questionnaire import views
 from . import views as unccd_views
 
+app_name = "unccd"
+
 urlpatterns = [
     path(
         "",

apps/watershed/urls.py

@@ -3,6 +3,8 @@ from django.urls import path
 from apps.questionnaire import views
 from . import views as watershed_views
 
+app_name = "watershed"
+
 urlpatterns = [
     # The 'home' route points to the list
     path(

apps/wocat/urls.py

-from django.urls import include, path
+from django.urls import path
 from django.views.generic import TemplateView
 
 from apps.questionnaire.views import QuestionnaireListView, QuestionnaireFilterView
 
+app_name = "wocat"
+
 urlpatterns = [
     path("", TemplateView.as_view(template_name="wocat/home.html"), name="home"),
     path(
@@ -34,15 +36,15 @@ urlpatterns = [
         QuestionnaireFilterView.as_view(configuration_code=__package__),
         name="questionnaire_filter_partial",
     ),
-    path("", include(("apps.accounts.urls", "accounts"), namespace="accounts")),
-    path("", include(("apps.approaches.urls", "approaches"), namespace="approaches")),
-    path("", include(("apps.sample.urls", "sample"), namespace="sample")),
-    path("", include(("apps.api.urls.v1", "v1"), namespace="v1")),
-    path(
-        "", include(("apps.samplemulti.urls", "samplemulti"), namespace="samplemulti")
-    ),
-    path(
-        "",
-        include(("apps.samplemodule.urls", "samplemodule"), namespace="samplemodule"),
-    ),
+    # path("", include(("apps.accounts.urls", "accounts"), namespace="accounts")),
+    # path("", include(("apps.approaches.urls", "approaches"), namespace="approaches")),
+    # path("", include(("apps.sample.urls", "sample"), namespace="sample")),
+    # path("", include(("apps.api.urls.v1", "v1"), namespace="v1")),
+    # path(
+    #     "", include(("apps.samplemulti.urls", "samplemulti"), namespace="samplemulti")
+    # ),
+    # path(
+    #     "",
+    #     include(("apps.samplemodule.urls", "samplemodule"), namespace="samplemodule"),
+    # ),
 ]

config/urls.py

@@ -5,35 +5,14 @@ from django.contrib import admin
 from django.urls import reverse_lazy, path, include
 from django.views.generic import TemplateView, RedirectView
 
-from apps.qcat import views
+from apps.qcat.views import AdminLoginView, FactsTeaserView
 
-# The following urls are created with the locale as prefix, eg.
 urlpatterns = [
-    path("about/", views.about, name="about"),
-    path(
-        "about/imprint/",
-        TemplateView.as_view(template_name="qcat/imprint.html"),
-        name="imprint",
-    ),
-    path(
-        "about/terms-of-agreement/",
-        TemplateView.as_view(template_name="qcat/terms-of-agreement.html"),
-        name="terms-of-agreement",
-    ),
-    path(
-        "about/privacy-policy/",
-        TemplateView.as_view(template_name="qcat/privacy-policy.html"),
-        name="privacy-policy",
-    ),
-    path("admin/login/", views.AdminLoginView.as_view(), name="admin_login"),
+    path("about/", include("apps.qcat.urls")),
     path("grappelli/", include("grappelli.urls")),
+    path("admin/login/", AdminLoginView.as_view(), name="admin_login"),
     path("admin/", admin.site.urls),
-    # path(
-    #     "sitemap.xml",
-    #     sitemap,
-    #     {"sitemaps": views.static_sitemap},
-    #     name="django.contrib.sitemaps.views.sitemap",
-    # ),
+    # path("sitemap.xml", sitemap, {"sitemaps": views.static_sitemap}, name="django.contrib.sitemaps.views.sitemap",),
     path("robots.txt", TemplateView.as_view(template_name="robots.txt")),
 ]
 # en/questionnaire
@@ -43,54 +22,29 @@ urlpatterns += i18n_patterns(
         RedirectView.as_view(url=reverse_lazy("wocat:home"), permanent=False),
         name="home",
     ),
-    path(
-        "accounts/", include(("apps.accounts.urls", "accounts"), namespace="accounts")
-    ),
-    path("api/", include(("apps.api.urls", "api"), namespace="api")),
-    path(
-        "configuration/",
-        include(
-            ("apps.configuration.urls", "configuration"), namespace="configuration"
-        ),
-    ),
+    path("accounts/", include("apps.accounts.urls")),
+    path("api/", include("apps.api.urls")),
+    path("configuration/", include("apps.configuration.urls")),
     path("notifications/", include("apps.notifications.urls")),
-    path("qcat/facts_teaser", views.FactsTeaserView.as_view(), name="facts_teaser"),
+    path("qcat/facts_teaser", FactsTeaserView.as_view(), name="facts_teaser"),
     path("questionnaire/", include("apps.questionnaire.urls")),
-    path("search/", include(("apps.search.urls", "search"), namespace="search")),
-    path(
-        "samplemulti/",
-        include(("apps.samplemulti.urls", "search"), namespace="samplemulti"),
-    ),
+    path("search/", include("apps.search.urls")),
+    path("samplemulti/", include("apps.samplemulti.urls")),
     path("summary/", include("apps.summary.urls")),
-    path("unccd/", include(("apps.unccd.urls", "unccd"), namespace="unccd")),
-    path("wocat/", include(("apps.wocat.urls", "wocat"), namespace="wocat")),
-    path(
-        "wocat/approaches/",
-        include(("apps.approaches.urls", "approaches"), namespace="approaches"),
-    ),
-    path("wocat/cca/", include(("apps.cca.urls", "cca"), namespace="cca")),
-    path("wocat/cbp/", include(("apps.cbp.urls", "cbp"), namespace="cbp")),
-    path(
-        "wocat/technologies/",
-        include(("apps.technologies.urls", "technologies"), namespace="technologies"),
-    ),
-    path(
-        "wocat/watershed/",
-        include(("apps.watershed.urls", "watershed"), namespace="watershed"),
-    ),
+    path("unccd/", include("apps.unccd.urls")),
+    path("wocat/", include("apps.wocat.urls")),
+    path("wocat/approaches/", include("apps.approaches.urls")),
+    path("wocat/cca/", include("apps.cca.urls")),
+    path("wocat/cbp/", include("apps.cbp.urls")),
+    path("wocat/technologies/", include("apps.technologies.urls")),
+    path("wocat/watershed/", include("apps.watershed.urls")),
 )
 
 if settings.DEBUG:
     urlpatterns += [path("__debug__/", include("debug_toolbar.urls"))]
 
 urlpatterns += i18n_patterns(
-    # path("sample/", include(("apps.sample.urls", "sample"), namespace="sample")),
-    # re_path(r'^samplemulti/', include(('apps.samplemulti.urls','samplemulti'),
-    #     namespace='samplemulti')),
-    path(
-        "samplemodule/",
-        include(("apps.samplemodule.urls", "samplemodule"), namespace="samplemodule"),
-    ),
+    path("samplemodule/", include("apps.samplemodule.urls")),
     path("404/", TemplateView.as_view(template_name="404.html")),
     path("500/", TemplateView.as_view(template_name="500.html")),
     path("503/", TemplateView.as_view(template_name="503.html")),