Skip to content

Commit

Permalink
replace url() by path/re_path() in demo app (#313)
Browse files Browse the repository at this point in the history
Co-authored-by: GFJ138 <sebastien.dementen@engie.com>
  • Loading branch information
sdementen and sebastiendementen committed Jan 24, 2021
1 parent bd90a95 commit 6cef277
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
32 changes: 16 additions & 16 deletions demo/demo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# pylint: disable=wrong-import-position,wrong-import-order

from django.contrib import admin
from django.urls import include
from django.urls import include, path
from django.conf.urls import url

from django.views.generic import TemplateView
Expand All @@ -35,21 +35,21 @@
from .views import dash_example_1_view, session_state_view

urlpatterns = [
url('^$', TemplateView.as_view(template_name='index.html'), name="home"),
url('^demo-one$', TemplateView.as_view(template_name='demo_one.html'), name="demo-one"),
url('^demo-two$', TemplateView.as_view(template_name='demo_two.html'), name="demo-two"),
url('^demo-three$', TemplateView.as_view(template_name='demo_three.html'), name="demo-three"),
url('^demo-four$', TemplateView.as_view(template_name='demo_four.html'), name="demo-four"),
url('^demo-five$', TemplateView.as_view(template_name='demo_five.html'), name="demo-five"),
url('^demo-six', dash_example_1_view, name="demo-six"),
url('^demo-seven', TemplateView.as_view(template_name='demo_seven.html'), name="demo-seven"),
url('^demo-eight', session_state_view, {'template_name':'demo_eight.html'}, name="demo-eight"),
url('^demo-nine', TemplateView.as_view(template_name='demo_nine.html'), name="demo-nine"),
url('^demo-ten', TemplateView.as_view(template_name='demo_ten.html'), name="demo-ten"),
url('^admin/', admin.site.urls),
url('^django_plotly_dash/', include('django_plotly_dash.urls')),

url('^demo-session-var$', add_to_session, name="session-variable-example"),
path('', TemplateView.as_view(template_name='index.html'), name="home"),
path('demo-one', TemplateView.as_view(template_name='demo_one.html'), name="demo-one"),
path('demo-two', TemplateView.as_view(template_name='demo_two.html'), name="demo-two"),
path('demo-three', TemplateView.as_view(template_name='demo_three.html'), name="demo-three"),
path('demo-four', TemplateView.as_view(template_name='demo_four.html'), name="demo-four"),
path('demo-five', TemplateView.as_view(template_name='demo_five.html'), name="demo-five"),
path('demo-six', dash_example_1_view, name="demo-six"),
path('demo-seven', TemplateView.as_view(template_name='demo_seven.html'), name="demo-seven"),
path('demo-eight', session_state_view, {'template_name':'demo_eight.html'}, name="demo-eight"),
path('demo-nine', TemplateView.as_view(template_name='demo_nine.html'), name="demo-nine"),
path('demo-ten', TemplateView.as_view(template_name='demo_ten.html'), name="demo-ten"),
path('admin/', admin.site.urls),
path('django_plotly_dash/', include('django_plotly_dash.urls')),

path('demo-session-var', add_to_session, name="session-variable-example"),
]

# Add in static routes so daphne can serve files; these should
Expand Down
7 changes: 4 additions & 3 deletions django_plotly_dash/routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from channels.http import AsgiHandler

from django.conf.urls import url
from django.urls import re_path

from .consumers import MessageConsumer, PokePipeConsumer
from .util import pipe_ws_endpoint_name, http_endpoint, http_poke_endpoint_enabled
Expand All @@ -37,11 +38,11 @@
]

if http_poke_endpoint_enabled():
http_routes.append(url(http_endpoint("poke"), PokePipeConsumer))
http_routes.append(re_path(http_endpoint("poke"), PokePipeConsumer))

http_routes.append(url("^", AsgiHandler)) # AsgiHandler is 'the normal Django view handlers'
http_routes.append(re_path("^", AsgiHandler)) # AsgiHandler is 'the normal Django view handlers'

application = ProtocolTypeRouter({
'websocket': AuthMiddlewareStack(URLRouter([url(pipe_ws_endpoint_name(), MessageConsumer),])),
'websocket': AuthMiddlewareStack(URLRouter([re_path(pipe_ws_endpoint_name(), MessageConsumer),])),
'http': AuthMiddlewareStack(URLRouter(http_routes)),
})

0 comments on commit 6cef277

Please sign in to comment.