Switch main urls.py to use path
This commit is contained in:
parent
922afef356
commit
8b805b313e
1 changed files with 13 additions and 14 deletions
|
@ -17,7 +17,6 @@
|
||||||
# along with this program in a file in the toplevel directory called
|
# along with this program in a file in the toplevel directory called
|
||||||
# "AGPLv3". If not, see <http://www.gnu.org/licenses/>.
|
# "AGPLv3". If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from django.conf.urls import url
|
|
||||||
from django.urls import include, path, re_path
|
from django.urls import include, path, re_path
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
|
@ -28,17 +27,17 @@ from . import views as static_views
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', frontpage.view),
|
path('', frontpage.view),
|
||||||
url(r'^sponsors$', frontpage.view),
|
path('sponsors', frontpage.view),
|
||||||
url(r'^sponsors/$', sponsors.view),
|
path('sponsors/', sponsors.view),
|
||||||
url(r'^sponsors/index.html$', sponsors.view),
|
path('sponsors/index.html', sponsors.view),
|
||||||
url(r'^admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
url(r'^feeds/blog/?$', feeds.BlogFeed()),
|
path('feeds/blog/', feeds.BlogFeed()),
|
||||||
url(r'^feeds/news/?$', feeds.PressReleaseFeed()),
|
path('feeds/news/', feeds.PressReleaseFeed()),
|
||||||
url(r'^feeds/omnibus/?$', feeds.OmnibusFeed()),
|
path('feeds/omnibus/', feeds.OmnibusFeed()),
|
||||||
url(r'^feeds/?$', feeds.view),
|
path('feeds/', feeds.view),
|
||||||
url(r'^news/', include('conservancy.news.urls')),
|
path('news/', include('conservancy.news.urls')),
|
||||||
url(r'^blog/', include('conservancy.blog.urls')),
|
path('blog/', include('conservancy.blog.urls')),
|
||||||
# formerly static templated things... (dirs with templates)
|
# formerly static templated things... (dirs with templates)
|
||||||
re_path(r'^about', static_views.index),
|
re_path(r'^about', static_views.index),
|
||||||
re_path(r'^activities', static_views.index),
|
re_path(r'^activities', static_views.index),
|
||||||
|
@ -52,9 +51,9 @@ urlpatterns = [
|
||||||
path('contractpatch/', include('conservancy.contractpatch.urls')),
|
path('contractpatch/', include('conservancy.contractpatch.urls')),
|
||||||
re_path(r'^overview', static_views.index),
|
re_path(r'^overview', static_views.index),
|
||||||
re_path(r'^privacy-policy', static_views.index),
|
re_path(r'^privacy-policy', static_views.index),
|
||||||
url(r'^sustainer/', include('conservancy.supporter.urls')),
|
path('sustainer/', include('conservancy.supporter.urls')),
|
||||||
re_path(r'^coming-soon.html', static_views.index),
|
re_path(r'^coming-soon.html', static_views.index),
|
||||||
url(r'^fundraiser_data', fundgoal_views.view),
|
path('fundraiser_data/', fundgoal_views.view),
|
||||||
path('assignment/', include('conservancy.assignment.urls')),
|
path('assignment/', include('conservancy.assignment.urls')),
|
||||||
re_path(r'^fossy/$', static_views.index),
|
re_path(r'^fossy/$', static_views.index),
|
||||||
path('fossy/', include('conservancy.fossy.urls')),
|
path('fossy/', include('conservancy.fossy.urls')),
|
||||||
|
|
Loading…
Reference in a new issue