bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update regex and clean-up

Browse Source
This commit is contained in:
Patrick Mayr
2021-05-28 13:13:18 +00:00
parent 7f53fc13e6
commit c0f8ac9ba5
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fet2020/fet2020/urls.py
View File

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