update regex and clean-up

fet2020/fet2020/urls.py

@@ -1,10 +1,11 @@
-from django.contrib import admin
-from django.urls import path, include
-from django.conf.urls.static import static
 from django.conf import settings
-from django.views.generic import RedirectView
+from django.conf.urls.static import static
+from django.contrib import admin, flatpages
 from django.contrib.sitemaps.views import sitemap
-from . import views
+from django.urls import include, path, re_path
+from django.views.generic import RedirectView
+from rest_framework import routers
+
 from posts.viewsets import PostViewSet
 from members.urls import member_urlpatterns, jobs_urlpatterns
 from members.viewsets import (
@@ -13,11 +14,9 @@ from members.viewsets import (
     JobGroupViewSet,
     JobMemberViewSet,
 )
-from rest_framework import routers
-from .sitemaps import sitemaps
 
-from django.contrib import flatpages
-from django.urls import re_path
+from . import views
+from .sitemaps import sitemaps
 
 
 router = routers.DefaultRouter()
@@ -28,27 +27,27 @@ router.register(r"jobs", JobViewSet)
 router.register(r"jobmembers", JobMemberViewSet)
 
 urlpatterns = [
-    path("posts/", include("posts.urls")),
     path("admin/doc/", include("django.contrib.admindocs.urls")),
     path("admin/login/", RedirectView.as_view(pattern_name="login")),
     path("admin/", admin.site.urls),
     path("auth/", include("authentications.urls")),
     path("", views.index, name="home"),
-    path("index.html", views.index, name="home"),
-    path("ckeditor/", include("ckeditor_uploader.urls")),
     path("api/", include(router.urls)),
-    path("members/", include("members.urls"), name="members"),
-    path("jobs/", include(jobs_urlpatterns), name="jobs"),
-    path("member/", include(member_urlpatterns), name="member"),
     path("blackboard/", include("blackboard.urls"), name="blackboard"),
+    path("ckeditor/", include("ckeditor_uploader.urls")),
+    path("index.html", views.index, name="home"),
+    path("jobs/", include(jobs_urlpatterns), name="jobs"),
+    path("members/", include("members.urls"), name="members"),
+    path("member/", include(member_urlpatterns), name="member"),
+    path("posts/", include("posts.urls")),
     path("tasks/", include("tasks.urls"), name="tasks"),
-    path('pages/', include('django.contrib.flatpages.urls')),
     path(
         "sitemap.xml",
         sitemap,
         {"sitemaps": sitemaps},
         name="django.contrib.sitemaps.views.sitemap",
     ),
-    re_path(r'^(?P<url>.*/)$', flatpages.views.flatpage),
+    path('pages/', include('django.contrib.flatpages.urls')),
+    re_path(r'^(?P<url>)/', flatpages.views.flatpage),
     path('impressum/', flatpages.views.flatpage, {'url': '/impressum/'}, name='impressum'),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)