mirror of
https://github.com/pinry/pinry.git
synced 2025-11-16 18:05:51 +01:00
Fix: try to fix urls
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls.static import static
|
||||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.views.static import serve
|
from django.urls import path, include
|
||||||
from rest_framework.documentation import include_docs_urls
|
from rest_framework.documentation import include_docs_urls
|
||||||
|
|
||||||
from core.views import drf_router
|
from core.views import drf_router
|
||||||
@@ -13,21 +13,19 @@ admin.autodiscover()
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
# drf api
|
# drf api
|
||||||
url(r'^api/v2/', include(drf_router.urls)),
|
path('api/v2/', include(drf_router.urls)),
|
||||||
url(r'^api-auth/', include('rest_framework.urls', namespace="rest_framework")),
|
path('api-auth/', include('rest_framework.urls', namespace="rest_framework")),
|
||||||
url(r'^api/v2/docs/', include_docs_urls(title='PinryAPI', schema_url='/')),
|
path('api/v2/docs/', include_docs_urls(title='PinryAPI', schema_url='/')),
|
||||||
|
|
||||||
# old api and views
|
# old api and views
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
path(r'admin/', include(admin.site.urls, namespace="admin")),
|
||||||
url(r'^api/v2/profile/', include('users.urls', namespace='users')),
|
path(r'api/v2/profile/', include('users.urls', namespace='users')),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
urlpatterns += staticfiles_urlpatterns()
|
urlpatterns += staticfiles_urlpatterns()
|
||||||
urlpatterns += [
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT, }),
|
|
||||||
]
|
|
||||||
|
|
||||||
if settings.IS_TEST:
|
if settings.IS_TEST:
|
||||||
urlpatterns += staticfiles_urlpatterns()
|
urlpatterns += staticfiles_urlpatterns()
|
||||||
|
|||||||
Reference in New Issue
Block a user