-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/andela/ah-backend-invictus…
… into ch-setup-travis-165273464
- Loading branch information
Showing
6 changed files
with
30 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"addons": [ | ||
|
||
], | ||
"buildpacks": [ | ||
|
||
], | ||
"env": { | ||
}, | ||
"formation": { | ||
}, | ||
"name": "ah-backend-invictus", | ||
"scripts": { | ||
}, | ||
"stack": "heroku-18" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
from django.conf.urls import url | ||
from django.urls import path | ||
|
||
from .views import ( | ||
LoginAPIView, RegistrationAPIView, UserRetrieveUpdateAPIView | ||
) | ||
|
||
urlpatterns = [ | ||
url(r'^user/?$', UserRetrieveUpdateAPIView.as_view()), | ||
url(r'^users/?$', RegistrationAPIView.as_view()), | ||
url(r'^users/login/?$', LoginAPIView.as_view()), | ||
path('user/', UserRetrieveUpdateAPIView.as_view()), | ||
path('users/', RegistrationAPIView.as_view()), | ||
path('users/login/', LoginAPIView.as_view()), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,22 @@ | ||
"""authors URL Configuration | ||
The `urlpatterns` list routes URLs to views. For more information please see: | ||
https://docs.djangoproject.com/en/1.11/topics/http/urls/ | ||
https://docs.djangoproject.com/en/2.1/topics/http/urls/ | ||
Examples: | ||
Function views | ||
1. Add an import: from my_app import views | ||
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') | ||
2. Add a URL to urlpatterns: path('', views.home, name='home') | ||
Class-based views | ||
1. Add an import: from other_app.views import Home | ||
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') | ||
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') | ||
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')) | ||
1. Import the include() function: from django.urls import include, path | ||
2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) | ||
""" | ||
from django.conf.urls import include, url | ||
from django.urls import include, path | ||
from django.contrib import admin | ||
|
||
urlpatterns = [ | ||
url(r'^admin/', admin.site.urls), | ||
|
||
url(r'^api/', include('authors.apps.authentication.urls', namespace='authentication')), | ||
path('admin/', admin.site.urls), | ||
path('api/', include('authors.apps.authentication.urls')), | ||
] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters