diff --git a/pybay/urls.py b/pybay/urls.py index 6ee4b56..21162e2 100644 --- a/pybay/urls.py +++ b/pybay/urls.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.conf.urls import include, url +from django.conf.urls import include, path from django.conf.urls.static import static from django.views.generic import TemplateView from django.views.generic.base import RedirectView @@ -23,50 +23,50 @@ urlpatterns = [ - url(r"^$", views.FrontpageView.as_view(faq_filter="show_on_home"), name="home"), - # url(r"^cfp$", views.pybay_cfp_create, name="pybay_cfp"), - # url(r'^call-for-proposals/$', RedirectView.as_view(pattern_name='pybay_cfp', permanent=False)), - url(r"^sponsors-prospectus/$", faq_view(template_name="frontend/sponsors_prospectus.html", faq_filter="show_on_sponsors"), name="pybay_sponsors"), - url(r'^sponsors/$', RedirectView.as_view(pattern_name='pybay_sponsors', permanent=False)), - url(r"^code-of-conduct$", TemplateView.as_view(template_name="frontend/code_of_conduct.html"), name="pybay_coc"), - url(r"^coc-reporting$", TemplateView.as_view(template_name="frontend/coc_reporting.html"), name="pybay_coc_reporting"), - url(r"^registration$", RedirectView.as_view(url='https://ti.to/sf-python/pybay2019')), - url(r"^faq$", views.pybay_faq_index, name="pybay_faq"), + path('', views.FrontpageView.as_view(faq_filter="show_on_home"), name="home"), + # path('cfp', views.pybay_cfp_create, name="pybay_cfp"), + # path('call-for-proposals/', RedirectView.as_view(pattern_name='pybay_cfp', permanent=False)), + path('sponsors-prospectus/', faq_view(template_name="frontend/sponsors_prospectus.html", faq_filter="show_on_sponsors"), name="pybay_sponsors"), + path('sponsors/', RedirectView.as_view(pattern_name='pybay_sponsors', permanent=False)), + path('code-of-conduct', TemplateView.as_view(template_name="frontend/code_of_conduct.html"), name="pybay_coc"), + path('coc-reporting', TemplateView.as_view(template_name="frontend/coc_reporting.html"), name="pybay_coc_reporting"), + path('registration', RedirectView.as_view(url='https://ti.to/sf-python/pybay2019')), + path('faq', views.pybay_faq_index, name="pybay_faq"), - url(r"^admin/", include(admin.site.urls)), - url(r"^admin/blockstuff/docs", TemplateView.as_view(template_name="blockstuff/docs.html")), - url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), + path('admin/', include(admin.site.urls)), + path('admin/blockstuff/docs', TemplateView.as_view(template_name="blockstuff/docs.html")), + path('dashboard/', symposion.views.dashboard, name="dashboard"), - url(r"^account/", include("account.urls")), - #url(r"^speaker/", include(speaker_urls)), - url(r"^sponsors/", include("symposion.sponsorship.urls")), - url(r"^proposals/", include(proposals_urls)), - url(r"^talks/", preview_views.index, name="pybay_preview"), - url(r"^reviews/", include("symposion.reviews.urls")), - url(r"^boxes/", include("pinax.boxes.urls")), + path('account/', include("account.urls")), + #path('speaker/', include(speaker_urls)), + path('sponsors/', include("symposion.sponsorship.urls")), + path('proposals/', include(proposals_urls)), + path('talks/', preview_views.index, name="pybay_preview"), + path('reviews/', include("symposion.reviews.urls")), + path('boxes/', include("pinax.boxes.urls")), - url(r"^schedule/", views.pybay_schedule, name='pybay_schedule'), - url(r"^schedule-sym/", include("symposion.schedule.urls")), - # url(r"^account/signup/$", SignupView.as_view(), name="account_signup"), - # url(r"^account/login/$", symposion.views.LoginView.as_view(), name="account_login"), - # url(r"^teams/", include(teams_urls)), - # url(r"^teams/", include("symposion.teams.urls")), - # url(r"^markitup/", include("markitup.urls")), - url(r"^our-sponsors/$", views.pybay_sponsors_list, name="pybay_sponsors_list"), - url(r"^our-speakers/$", views.pybay_speakers_list, name="pybay_speakers_list"), - url(r"^speaker/(?P[-\w]+)/$", views.pybay_speakers_detail, name="pybay_speakers_detail"), - url(r"^api/undecided_proposals$", views.undecided_proposals, name="pybay_undecided_proposals"), - url(r"^api/proposals/(?P\d+)/$", views.proposal_detail, name="pybay_detail_proposal"), - url(r"^404$", TemplateView.as_view(template_name="404.html")), # Adding explicitly for template dev purposes - url(r"^jobs/", include("jobs.urls")), - url(r"^registration$", RedirectView.as_view(url='https://ti.to/sf-python/pybay2019'), name='pybay_tickets'), - # url(r"^", include("symposion.cms.urls")), -] + path('schedule/', views.pybay_schedule, name='pybay_schedule'), + path('schedule-sym/', include("symposion.schedule.urls")), + # path('account/signup/', SignupView.as_view(), name="account_signup"), + # path('account/login/', symposion.views.LoginView.as_view(), name="account_login"), + # path('teams/', include(teams_urls)), + # path('teams/', include("symposion.teams.urls")), + # path('markitup/', include("markitup.urls")), + path('our-sponsors/', views.pybay_sponsors_list, name="pybay_sponsors_list"), + path('our-speakers/', views.pybay_speakers_list, name="pybay_speakers_list"), + path('speaker//', views.pybay_speakers_detail, name="pybay_speakers_detail"), + path('api/undecided_proposals', views.undecided_proposals, name="pybay_undecided_proposals"), + path('api/proposals//', views.proposal_detail, name="pybay_detail_proposal"), + path('404', TemplateView.as_view(template_name="404.html")), # Adding explicitly for template dev purposes + path('jobs/', include("jobs.urls")), + path('registration', RedirectView.as_view(url='https://ti.to/sf-python/pybay2019'), name='pybay_tickets'), + # path('', include("symposion.cms.urls")), + ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) -if settings.DEBUG_TOOLBAR: +if settings.DEBUG: import debug_toolbar urlpatterns = [ - url(r'^__debug__/', include(debug_toolbar.urls)), + path('__debug__/', include(debug_toolbar.urls)), ] + urlpatterns