Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change url() to path()

Browse source
This commit is contained in:
Griatch 2021-05-22 16:29:13 +02:00
parent 4bea4d5703
commit b95ec69d66
4 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/web/admin/urls.py
View file

@ -6,26 +6,28 @@ These patterns are all under the admin/* namespace.
""" """
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.conf.urls import url, include from django.urls import path, include
from . import frontpage from . import frontpage
urlpatterns = [ urlpatterns = [
# Django original admin page. Make this URL is always available, whether # Django original admin page. Make this URL always available, whether
# we've chosen to use Evennia's custom admin or not. # we've chosen to use Evennia's custom admin or not.
url(r"django/", frontpage.admin_wrapper, name="django_admin"), path("django/", frontpage.admin_wrapper, name="django_admin"),
# Admin docs # Admin docs
url(r"doc/", include("django.contrib.admindocs.urls")), path("doc/", include("django.contrib.admindocs.urls")),
] ]
if settings.EVENNIA_ADMIN: if settings.EVENNIA_ADMIN:
urlpatterns += [ urlpatterns += [
# Our override for the admin. # Our override for the admin.
url("^$", frontpage.evennia_admin, name="evennia_admin"), path("", frontpage.evennia_admin, name="evennia_admin"),
# Makes sure that other admin pages get loaded. # Makes sure that other admin pages get loaded.
url(r"^", admin.site.urls), path("", admin.site.urls),
] ]
else: else:
# Just include the normal Django admin. # Just include the normal Django admin.
urlpatterns += [url(r"^/", admin.site.urls)] urlpatterns += [
path("", admin.site.urls)
]

4
evennia/web/urls.py
View file

@ -16,8 +16,6 @@ This is the starting point when a user enters an URL.
""" """
from django.conf.urls import url
from django.conf import settings from django.conf import settings
from django.urls import path, include from django.urls import path, include
from django.views.generic import RedirectView from django.views.generic import RedirectView
@ -38,4 +36,4 @@ urlpatterns = [
if settings.REST_API_ENABLED: if settings.REST_API_ENABLED:
# Rest API # Rest API
urlpatterns += [url(r"^api/", include("evennia.web.api.urls", namespace="api"))] urlpatterns += [path("api/", include("evennia.web.api.urls", namespace="api"))]

4
evennia/web/webclient/urls.py
View file

@ -7,4 +7,6 @@ from . import views
app_name = "webclient" app_name = "webclient"
urlpatterns = [path("", views.webclient, name="index")] urlpatterns = [
path("", views.webclient, name="index")
]

89
evennia/web/website/urls.py
View file

@ -4,71 +4,76 @@ This structures the website.
""" """
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.conf.urls import url, include from django.urls import path, include
from django import views as django_views from django import views as django_views
from .views import (index, errors, accounts, help as helpviews, channels, from .views import (index, errors, accounts, help as helpviews, channels,
characters) characters)
urlpatterns = [ urlpatterns = [
# website front page # website front page
url(r"^$", index.EvenniaIndexView.as_view(), name="index"), #url(r"^$", index.EvenniaIndexView.as_view(), name="index"),
path("", index.EvenniaIndexView.as_view(), name="index"),
# errors # errors
url(r"^tbi/", errors.to_be_implemented, name="to_be_implemented"), path(r"tbi/", errors.to_be_implemented, name="to_be_implemented"),
# User Authentication (makes login/logout url names available) # User Authentication (makes login/logout url names available)
url(r"^auth/register", accounts.AccountCreateView.as_view(), name="register"), path("auth/register", accounts.AccountCreateView.as_view(), name="register"),
url(r"^auth/", include("django.contrib.auth.urls")), path("auth/", include("django.contrib.auth.urls")),
# Help Topics # Help Topics
url(r"^help/$", helpviews.HelpListView.as_view(), name="help"), path("help/", helpviews.HelpListView.as_view(), name="help"),
url(r"^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$", # url(r"^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$",
helpviews.HelpDetailView.as_view(), # helpviews.HelpDetailView.as_view(),
name="help-entry-detail"), # name="help-entry-detail"),
path(r"help/<str:category>/<str:topic>/",
helpviews.HelpDetailView.as_view(),
name="help-entry-detail"),
# Channels # Channels
url(r"^channels/$", channels.ChannelListView.as_view(), name="channels"), path("channels/", channels.ChannelListView.as_view(), name="channels"),
url(r"^channels/(?P<slug>[\w\d\-]+)/$", # url(r"^channels/(?P<slug>[\w\d\-]+)/$",
channels.ChannelDetailView.as_view(), # channels.ChannelDetailView.as_view(),
name="channel-detail"), # name="channel-detail"),
path("channels/<str:slug>/",
channels.ChannelDetailView.as_view(),
name="channel-detail"),
# Character management # Character management
url(r"^characters/$", characters.CharacterListView.as_view(), name="characters"), path("characters/", characters.CharacterListView.as_view(), name="characters"),
url(r"^characters/create/$", path("characters/create/",
characters.CharacterCreateView.as_view(), characters.CharacterCreateView.as_view(),
name="character-create"), name="character-create"),
url(r"^characters/manage/$", path("characters/manage/",
characters.CharacterManageView.as_view(), characters.CharacterManageView.as_view(),
name="character-manage"), name="character-manage"),
url(r"^characters/detail/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$", path("characters/detail/<str:slug>/<int:pk>/",
characters.CharacterDetailView.as_view(), characters.CharacterDetailView.as_view(),
name="character-detail"), name="character-detail"),
url(r"^characters/puppet/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$", path("characters/puppet/<str:slug>/<int:pk>/",
characters.CharacterPuppetView.as_view(), characters.CharacterPuppetView.as_view(),
name="character-puppet"), name="character-puppet"),
url(r"^characters/update/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$", path("characters/update/<str:slug>/<int:pk>/",
characters.CharacterUpdateView.as_view(), characters.CharacterUpdateView.as_view(),
name="character-update"), name="character-update"),
url(r"^characters/delete/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$", path("characters/delete/<str:slug>/<int:pk>/",
characters.CharacterDeleteView.as_view(), characters.CharacterDeleteView.as_view(),
name="character-delete"), name="character-delete"),
] ]
# This sets up the server if the user want to run the Django # This sets up the server if the user want to run the Django test server (this
# test server (this should normally not be needed). # is not recommended and is usually unnecessary).
if settings.SERVE_MEDIA: if settings.SERVE_MEDIA:
urlpatterns.extend( urlpatterns.extend(
[ [
url( path("media/<str:path>",
r"^media/(?P<path>.*)$", django_views.static.serve,
django_views.static.serve, {"document_root": settings.MEDIA_ROOT},
{"document_root": settings.MEDIA_ROOT},
), ),
url( path("static/<str:path>",
r"^static/(?P<path>.*)$", django_views.static.serve,
django_views.static.serve, {"document_root": settings.STATIC_ROOT},
{"document_root": settings.STATIC_ROOT},
), ),
] ]
) )