Skip to content

Commit

Permalink
Merge 7532ab4 into aea8163
Browse files Browse the repository at this point in the history
  • Loading branch information
AGMETEOR committed Aug 28, 2018
2 parents aea8163 + 7532ab4 commit 64dd13e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
10 changes: 8 additions & 2 deletions authors/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',

]

ROOT_URLCONF = 'authors.urls'
Expand Down Expand Up @@ -121,11 +122,16 @@

STATIC_URL = '/static/'

CORS_ORIGIN_ALLOW_ALL = True
CORS_ALLOW_CREDENTIALS = True

CORS_ORIGIN_WHITELIST = (
'0.0.0.0:4000',
'localhost:4000',
'127.0.0.1:3000',
'localhost:3000',
'https://authors-haven-front.herokuapp.com/',
)


# Tell Django about the custom `User` model we created. The string
# `authentication.User` tells Django we are referring to the `User` model in
# the `authentication` module. This module is registered above in a setting
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cryptography==2.3.1
defusedxml==0.5.0
Django==2.0.7
django-braces==1.13.0
django-cors-headers==2.4.0
django-cors-middleware==1.3.1
django-extensions==2.1.0
django-filter==2.0.0
Expand Down

0 comments on commit 64dd13e

Please sign in to comment.