Skip to content

Commit

Permalink
Merge branch 'develop' into ft-signupvalidation-162948908
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesbeamie committed Jan 16, 2019
2 parents 3aac76a + 61456cf commit 3b06389
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 3 deletions.
6 changes: 6 additions & 0 deletions authors/apps/authentication/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.contrib import admin
from . import models

# Register your models here.

admin.site.register(models.User)
2 changes: 1 addition & 1 deletion authors/apps/authentication/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.1.4 on 2019-01-07 13:53
# Generated by Django 2.1.4 on 2019-01-13 19:18

from django.db import migrations, models

Expand Down
2 changes: 1 addition & 1 deletion authors/apps/authentication/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from rest_framework import status
from rest_framework.generics import RetrieveUpdateAPIView
from rest_framework.generics import RetrieveUpdateAPIView, GenericAPIView
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
Expand Down
8 changes: 8 additions & 0 deletions authors/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'authors.apps.authentication',
'authors.apps.core',
'authors.apps.profiles',
'rest_framework_swagger',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -150,3 +151,10 @@

# Activate Django-Heroku.
django_heroku.settings(locals())

# Swagger settings
SWAGGER_SETTINGS = {
'SHOW_REQUEST_HEADERS': True,
'USE_SESSION_AUTH': False,
}

4 changes: 3 additions & 1 deletion authors/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
"""
from django.urls import include, path
from django.contrib import admin
from rest_framework_swagger.views import get_swagger_view
schema_view = get_swagger_view(title='Authors Haven')

urlpatterns = [
path('admin/', admin.site.urls),

path(r'swagger-docs/', schema_view),
path('api/', include('authors.apps.authentication.urls')),
]

16 changes: 16 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
certifi==2018.11.29
chardet==3.0.4
coreapi==2.3.3
coreschema==0.0.4
Django==2.1.4
django-cors-middleware==1.3.1
django-extensions==2.1.4
django-heroku==0.3.1
django-rest-swagger==2.2.0
djangorestframework==3.9.0
gunicorn==19.9.0
idna==2.8
itypes==1.1.0
Jinja2==2.10
MarkupSafe==1.1.0
openapi-codec==1.3.2
psycopg2-binary==2.7.6.1
PyJWT==1.7.1
pytz==2018.9
requests==2.21.0
simplejson==3.16.0
six==1.12.0
gunicorn==19.9.0
django-heroku==0.3.1
uritemplate==3.0.0
urllib3==1.24.1

0 comments on commit 3b06389

Please sign in to comment.