X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ea221b2bc448ce22dfda4f1ead2968fa7de31771..b95b09260db87f6665bfcef3fb4f7c19f8acb666:/src/api/urls.py?ds=sidebyside diff --git a/src/api/urls.py b/src/api/urls.py index 150dc4c0b..9c8dab26f 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -5,9 +5,8 @@ from django.conf.urls import url, include from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView -from piston.authentication import oauth_access_token, oauth_request_token import catalogue.views -from api import handlers +from stats.utils import piwik_track_view from api.piston_patch import oauth_user_auth from . import views @@ -15,7 +14,7 @@ from . import views urlpatterns = [ url(r'^oauth/request_token/$', views.OAuth1RequestTokenView.as_view()), url(r'^oauth/authorize/$', oauth_user_auth, name='oauth_user_auth'), - url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)), + url(r'^oauth/access_token/$', csrf_exempt(views.OAuth1AccessTokenView.as_view())), url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'), @@ -24,13 +23,20 @@ urlpatterns = [ url(r'tag/(?P\d*?)/info\.html$', catalogue.views.tag_info), # reading data - url(r'^reading/(?P[a-z0-9-]+)/$', views.BookUserDataView.as_view(), name='api_reading'), - url(r'^reading/(?P[a-z0-9-]+)/(?P[a-z]+)/$', views.BookUserDataView.as_view(), name='api_reading'), - url(r'^username/$', views.UserView.as_view(), name='api_username'), + url(r'^reading/(?P[a-z0-9-]+)/$', + piwik_track_view(views.BookUserDataView.as_view()), + name='api_reading'), + url(r'^reading/(?P[a-z0-9-]+)/(?P[a-z]+)/$', + piwik_track_view(views.BookUserDataView.as_view()), + name='api_reading'), + url(r'^username/$', + piwik_track_view(views.UserView.as_view()), + name='api_username'), - url(r'^blog/$', views.BlogView.as_view()), + url(r'^blog/$', + piwik_track_view(views.BlogView.as_view())), - url(r'^pictures/$', include('picture.api.urls')), + url(r'^pictures/', include('picture.api.urls')), url(r'^', include('social.api.urls')), url(r'^', include('catalogue.api.urls')), ]