From d87b9ca2d1eef2e329a7f47d5471741984f90fff Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Mon, 19 Aug 2019 16:56:28 +0300 Subject: [PATCH] refactor urlpatterns --- project/settings/base.py | 2 +- project/urls/__init__.py | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/project/settings/base.py b/project/settings/base.py index fce72038..18df0282 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -55,9 +55,9 @@ PROJECT_APPS = [ 'account.apps.AccountConfig', 'authorization.apps.AuthorizationConfig', 'location.apps.LocationConfig', + 'main.apps.MainConfig', 'news.apps.NewsConfig', 'translation.apps.TranslationConfig', - ] EXTERNAL_APPS = [ diff --git a/project/urls/__init__.py b/project/urls/__init__.py index 37c25b50..3f1ee7a2 100644 --- a/project/urls/__init__.py +++ b/project/urls/__init__.py @@ -21,12 +21,8 @@ from drf_yasg import openapi from drf_yasg.views import get_schema_view from rest_framework import permissions -# URL platform patterns -from project.urls import web as web_urlpatterns -from location import urls as location_urls -from translation import urls as translation_urls - +# Docs urls schema_view = get_schema_view( openapi.Info( title="G&M API", @@ -50,24 +46,32 @@ urlpatterns_doc = [ re_path(r'^redocs/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'), - ] +# API urls urlpatterns_auth = [ path('api/auth/', include('authorization.urls.common')), ] +api_urlpatterns = [ + path('location/', include(('location.urls', 'location'), + namespace='location')), + path('main/', include(('main.urls', 'main'), + namespace='main')), + path('translation/', include(('translation.urls', 'translation'), + namespace='translation')), + path('web/', include(('project.urls.web', 'web'), + namespace='web')), +] + urlpatterns = [ path('admin/', admin.site.urls), - path('api/web/', include(web_urlpatterns)), - path('api/location/', include(location_urls.urlpatterns)), - path('api/translation/', include(translation_urls.urlpatterns)), + path('api/', include(api_urlpatterns)), ] urlpatterns = urlpatterns + \ urlpatterns_auth + \ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - if settings.DEBUG: urlpatterns.extend(urlpatterns_doc)