diff --git a/django_backend/backend/auth/v1/urls.py b/django_backend/backend/auth/v1/urls.py index 253c035296fa528a6ca3738f121b5591a61724b8..b3b22244a395548396e3be2cdaf9a871d6c1b788 100644 --- a/django_backend/backend/auth/v1/urls.py +++ b/django_backend/backend/auth/v1/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url from . import views -urlpatterns = [ +URLPATTERNS = [ url(r'^info/', views.AuthInfo.as_view()), url(r'^request/', views.Auth.as_view()), url(r'^callback/', views.AuthCallback.as_view()), diff --git a/django_backend/backend/clientapi/urls.py b/django_backend/backend/clientapi/urls.py index fe24d69432f7aeb72737f6d30951a532d77a16cc..f57353f6d5b8f777ba5f1b9abc288f90ae207e31 100644 --- a/django_backend/backend/clientapi/urls.py +++ b/django_backend/backend/clientapi/urls.py @@ -1,11 +1,8 @@ - from django.conf.urls import url -# from django.conf.urls import include -# from rest_framework import routers from . import views -urlpatterns = [ - url(r'^deployments', views.DeploymentsView.as_view()), - url(r'^config', views.ConfigurationView.as_view()), +URLPATTERNS = [ + url(r'^deployments/', views.DeploymentsView.as_view()), + url(r'^config/', views.ConfigurationView.as_view()), url(r'^ack/(?P\d+)/', views.AckView.as_view()), ] diff --git a/django_backend/backend/frontend/urls.py b/django_backend/backend/frontend/urls.py index 36d23088b10de2b519381c1f6489bbe3d16cdc85..b0a5329a9d534893fad31b7addd5e4dbe480f2f0 100644 --- a/django_backend/backend/frontend/urls.py +++ b/django_backend/backend/frontend/urls.py @@ -1,11 +1,8 @@ - from django.conf.urls import url from . import views - -urlpatterns = [ +URLPATTERNS = [ url(r'^state/', views.StateView.as_view()), url(r'^sshkey/', views.SSHPublicKeyView.as_view()), - url(r'^operational/', views.OperationalView.as_view()), url(r'^deployments/', views.DeploymentView.as_view()), ] diff --git a/django_backend/backend/urls.py b/django_backend/backend/urls.py index d58e5e53e4e5f5e0d4869310d425daf7e1c6942c..832a7fffa9d76966a55d6c129ba00b63593dffe2 100644 --- a/django_backend/backend/urls.py +++ b/django_backend/backend/urls.py @@ -1,14 +1,13 @@ from django.conf.urls import include, url from django.contrib import admin -from .clientapi import urls as clientapi_urls -from .frontend import urls as frontend_urls -from .auth.v1 import urls as auth_urls +from .clientapi.urls import URLPATTERNS as clientapi_urls +from .frontend.urls import URLPATTERNS as frontend_urls +from .auth.v1.urls import URLPATTERNS as auth_urls - -urlpatterns = [ - url(r'^clientapi/', include(clientapi_urls.urlpatterns)), - url(r'^api/', include(frontend_urls.urlpatterns)), - url(r'^auth/v1/', include(auth_urls.urlpatterns)), +URLPATTERNS = [ + url(r'^clientapi/', include(clientapi_urls)), + url(r'^api/', include(frontend_urls)), + url(r'^auth/v1/', include(auth_urls)), url(r'^admin', admin.site.urls), ] diff --git a/django_backend/urls.py b/django_backend/urls.py index c5b3220e231fce9811279d749b633f7a480274d9..aa0e2d534f1b05bb520ada996154a04c3c1a1a4b 100644 --- a/django_backend/urls.py +++ b/django_backend/urls.py @@ -3,5 +3,5 @@ from django.conf.urls import include, url from .backend import urls urlpatterns = [ - url(r'^backend/', include(urls.urlpatterns)), + url(r'^backend/', include(urls.URLPATTERNS)), ]