From 62330b9667f2602f88d2836d577cd2f17f604328 Mon Sep 17 00:00:00 2001
From: Max Yakovenko <mxyakovenko9@gmail.com>
Date: Thu, 12 Jul 2018 23:49:36 +0300
Subject: [PATCH] refactor project urls

---
 eshop_project/urls.py | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/eshop_project/urls.py b/eshop_project/urls.py
index eb14286..d853fc6 100644
--- a/eshop_project/urls.py
+++ b/eshop_project/urls.py
@@ -13,8 +13,7 @@ Including another URLconf
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf import settings
-from django.conf.urls import url, include
+from django.urls import re_path, include
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
@@ -22,22 +21,34 @@ from django.conf.urls.static import static
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^auth/', include('loginsys.urls', namespace='auth')),
-    url(r'^accounts/', include('core.urls', namespace='profile')),
-    url(r'^cart/', include('cart.urls', namespace='cart')),
-    url(r'^order/', include('orders.urls', namespace='orders')),
-    url(r'^discount/', include('discount.urls', namespace='discount')),
-    url(r'^search/', include('products.urls', namespace='products_search')),
-    url(r'^', include('products.urls', namespace='products')),
-    url(r'^landing/', include('landing.urls')),
-    url(r'^', include('orders.urls')),
-]\
-        + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \
-        + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    re_path(r'^admin/', admin.site.urls),
+
+    re_path(r'^ckeditor/', include('ckeditor_uploader.urls')),
+    re_path(r'^captcha/', include('captcha.urls')),
+
+    re_path('pages/', include('django.contrib.flatpages.urls')),
+
+    re_path('accounts/', include(('accounts_ext.urls', 'accounts_ext'), namespace='accounts_ext')),
+    re_path('accounts/', include('registration.backends.default.urls')),
+    re_path('accounts/', include(('django.contrib.auth.urls', 'django.contrib.auth'), namespace='accounts')),
+
+    re_path(r'', include(('index.urls', 'index'), namespace='index')),
+    re_path(r'^contact-us/', include(('contact_us.urls', 'contact_us'), namespace='contact_us')),
+
+    re_path(r'^products/', include(('products.urls', 'products'), namespace='products')),
+
+    # re_path(r'^cart/', include('cart.urls', namespace='cart')),
+    #
+    # re_path(r'^order/', include('orders.urls', namespace='orders')),
+    # re_path(r'^discount/', include('discount.urls', namespace='discount')),
+    # re_path(r'^landing/', include('landing.urls')),
+    # re_path(r'^products/', include('products.urls', namespace='products')),
+    # re_path(r'^', include('orders.urls',namespace='orders')),
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \
+  + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG:
     import debug_toolbar
     urlpatterns = [
-        url(r'^__debug__/', include(debug_toolbar.urls))
+        re_path(r'^__debug__/', include(debug_toolbar.urls))
     ] + urlpatterns