From 8f0485720c3167b8c280a3991d620e677d28cb33 Mon Sep 17 00:00:00 2001
From: Enrico Zini <enrico@enricozini.org>
Date: Tue, 21 Apr 2020 15:42:59 +0200
Subject: [PATCH] Use path in main site urls. refs: #9

---
 nm2/urls.py | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/nm2/urls.py b/nm2/urls.py
index c7ffb0f..1bdc102 100644
--- a/nm2/urls.py
+++ b/nm2/urls.py
@@ -1,4 +1,4 @@
-from django.urls import include, path, re_path
+from django.urls import include, path
 from django.views.generic import TemplateView
 from backend.mixins import VisitorTemplateView
 from django.conf import settings
@@ -24,43 +24,43 @@ django.conf.urls.handler500 = nmviews.Error500.as_view()
 urlpatterns = [
     path('robots.txt', TemplateView.as_view(
         template_name='robots.txt', content_type="text/plain"), name="root_robots_txt"),
-    re_path(r'^i18n/', include('django.conf.urls.i18n')),
-    re_path(r'^$', VisitorTemplateView.as_view(template_name='index.html'), name="home"),
-    re_path(r'^license/$', VisitorTemplateView.as_view(template_name='license.html'), name="root_license"),
-    re_path(r'^faq/$', VisitorTemplateView.as_view(template_name='faq.html'), name="root_faq"),
-    re_path(r'^members/$', public_views.Members.as_view(), name="members"),
-    re_path(r'^legacy/', include("legacy.urls")),
-    re_path(r'^person/', include("person.urls")),
-    re_path(r'^public/', include("public.urls")),
-    re_path(r'^am/', include("restricted.urls")),
-    re_path(r'^fprs/', include("fprs.urls")),
-    re_path(r'^process/', include("process.urls")),
-    re_path(r'^dm/', include("dm.urls")),
-    re_path(r'^api/', include("api.urls")),
-    re_path(r'^apikeys/', include("apikeys.urls")),
-    re_path(r'^keyring/', include("keyring.urls")),
-    re_path(r'^wizard/', include("wizard.urls")),
-    re_path(r'^mia/', include("mia.urls")),
-    re_path(r'^minechangelogs/', include("minechangelogs.urls")),
-    re_path(r'^sitechecks/', include("sitechecks.urls")),
-    re_path(r'^deploy/', include("deploy.urls")),
+    path('i18n/', include('django.conf.urls.i18n')),
+    path(r'', VisitorTemplateView.as_view(template_name='index.html'), name="home"),
+    path('license/', VisitorTemplateView.as_view(template_name='license.html'), name="root_license"),
+    path('faq/', VisitorTemplateView.as_view(template_name='faq.html'), name="root_faq"),
+    path('members/', public_views.Members.as_view(), name="members"),
+    path('legacy/', include("legacy.urls")),
+    path('person/', include("person.urls")),
+    path('public/', include("public.urls")),
+    path('am/', include("restricted.urls")),
+    path('fprs/', include("fprs.urls")),
+    path('process/', include("process.urls")),
+    path('dm/', include("dm.urls")),
+    path('api/', include("api.urls")),
+    path('apikeys/', include("apikeys.urls")),
+    path('keyring/', include("keyring.urls")),
+    path('wizard/', include("wizard.urls")),
+    path('mia/', include("mia.urls")),
+    path('minechangelogs/', include("minechangelogs.urls")),
+    path('sitechecks/', include("sitechecks.urls")),
+    path('deploy/', include("deploy.urls")),
 
-    re_path(r'^rest/api/', include(router.urls)),
+    path('rest/api/', include(router.urls)),
 
-    path(r'signon/', include("signon.urls")),
+    path('signon/', include("signon.urls")),
 
     # Uncomment the admin/doc line below to enable admin documentation:
-    re_path(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    path('admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    re_path(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
 
 if settings.DEBUG:
     try:
         import debug_toolbar
         urlpatterns += [
-            re_path(r'^__debug__/', include(debug_toolbar.urls)),
+            path('__debug__/', include(debug_toolbar.urls)),
         ]
     except ImportError:
         pass
-- 
GitLab