From df3d5300598ff1fdc2e7ef5469cba4892a7a6084 Mon Sep 17 00:00:00 2001 From: Christopher <112937295+carvalhochris@users.noreply.github.com> Date: Fri, 23 Dec 2022 15:20:22 +0000 Subject: [PATCH 1/2] Update api.py --- mysite/api.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mysite/api.py b/mysite/api.py index fa928f3..048e058 100644 --- a/mysite/api.py +++ b/mysite/api.py @@ -1,10 +1,12 @@ -from wagtail.api.v2.endpoints import PagesAPIEndpoint +from wagtail.api.v2.views import PagesAPIViewSet from wagtail.api.v2.router import WagtailAPIRouter -from wagtail.images.api.v2.endpoints import ImagesAPIEndpoint -from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint +from wagtail.images.api.v2.views import ImagesAPIViewSet +from wagtail.documents.api.v2.views import DocumentsAPIViewSet +# Init the Wagtail Router api_router = WagtailAPIRouter('wagtailapi') -api_router.register_endpoint('pages', PagesAPIEndpoint) -api_router.register_endpoint('images', ImagesAPIEndpoint) -api_router.register_endpoint('documents', DocumentsAPIEndpoint) \ No newline at end of file +# Register 3 API endpoints: Pages, Images and Documents +api_router.register_endpoint('pages', PagesAPIViewSet) +api_router.register_endpoint('images', ImagesAPIViewSet) +api_router.register_endpoint('documents', DocumentsAPIViewSet) From d5903c245321027fb553f48808b0dc3425e47a1e Mon Sep 17 00:00:00 2001 From: Christopher <112937295+carvalhochris@users.noreply.github.com> Date: Fri, 23 Dec 2022 15:27:25 +0000 Subject: [PATCH 2/2] Update urls.py --- mysite/urls.py | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/mysite/urls.py b/mysite/urls.py index b2902cc..d29f0aa 100644 --- a/mysite/urls.py +++ b/mysite/urls.py @@ -1,39 +1,24 @@ from django.conf import settings -from django.conf.urls import include, url +from django.urls import include, path from django.contrib import admin -from django.urls import path from wagtail.admin import urls as wagtailadmin_urls -from wagtail.core import urls as wagtail_urls -from wagtail.contrib.sitemaps.views import sitemap +from wagtail import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from search import views as search_views from .api import api_router - urlpatterns = [ - url(r'^django-admin/', admin.site.urls), - - url(r'^admin/', include(wagtailadmin_urls)), - url(r'^documents/', include(wagtaildocs_urls)), - - url(r'^search/$', search_views.search, name='search'), - - url(r'^api/v2/', api_router.urls), - - url(r'^sitemap.xml$', sitemap), - url(r'', include('allauth.urls')), - # url(r'^accounts/', include('allauth.urls')), - # For anything not caught by a more specific rule above, hand over to - # Wagtail's page serving mechanism. This should be the last pattern in - # the list: - url(r'', include(wagtail_urls)), - - # Alternatively, if you want Wagtail pages to be served from a subpath - # of your site, rather than the site root: - # url(r'^pages/', include(wagtail_urls)), + path("django-admin/", admin.site.urls), + path("admin/", include(wagtailadmin_urls)), + path("documents/", include(wagtaildocs_urls)), + path("search/", search_views.search, name="search"), + path('api/v2/', api_router.urls), + + # ... + path(r'', include(wagtail_urls)), ] @@ -45,7 +30,12 @@ urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - import debug_toolbar - urlpatterns = [ - path('__debug__/', include(debug_toolbar.urls)), - ] + urlpatterns +urlpatterns = urlpatterns + [ + # For anything not caught by a more specific rule above, hand over to + # Wagtail's page serving mechanism. This should be the last pattern in + # the list: + path("", include(wagtail_urls)), + # Alternatively, if you want Wagtail pages to be served from a subpath + # of your site, rather than the site root: + # path("pages/", include(wagtail_urls)), +]