-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove static/ directory and update frontend deployment docs (#718)
Followup on commit 2991254 which removed the management commands necessary for serving the frontend via Django. The supported workflow is now to deploy the frontend separately and configure it to talk to this Django app. If desired, both can be served by an Nginx proxy (which serves static files for the frontend and proxies /api requests to Django).
- Loading branch information
Showing
11 changed files
with
22 additions
and
37 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 |
---|---|---|
|
@@ -34,7 +34,7 @@ | |
|
||
# APP CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
DJANGO_APPS = ( | ||
DJANGO_APPS = [ | ||
# Default Django apps: | ||
'django.contrib.auth', | ||
'django.contrib.contenttypes', | ||
|
@@ -49,24 +49,25 @@ | |
|
||
# Admin | ||
'django.contrib.admin', | ||
) | ||
THIRD_PARTY_APPS = ( | ||
] | ||
|
||
THIRD_PARTY_APPS = [ | ||
'rest_framework', | ||
'rest_framework_gis', | ||
'rest_framework.authtoken', | ||
'social_django', | ||
'corsheaders', | ||
'django_filters', | ||
'drf_yasg', | ||
) | ||
] | ||
|
||
# Apps specific for this project go here. | ||
LOCAL_APPS = ( | ||
LOCAL_APPS = [ | ||
'osmchadjango.users', # custom users app | ||
'osmchadjango.changeset', | ||
'osmchadjango.supervise', | ||
'osmchadjango.roulette_integration', | ||
) | ||
] | ||
|
||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps | ||
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS | ||
|
@@ -100,9 +101,9 @@ | |
# FIXTURE CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FIXTURE_DIRS | ||
FIXTURE_DIRS = ( | ||
FIXTURE_DIRS = [ | ||
str(APPS_DIR.path('fixtures')), | ||
) | ||
] | ||
|
||
# EMAIL CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
|
@@ -111,9 +112,9 @@ | |
# MANAGER CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#admins | ||
ADMINS = ( | ||
ADMINS = [ | ||
('name', '[email protected]'), | ||
) | ||
] | ||
|
||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#managers | ||
MANAGERS = ADMINS | ||
|
@@ -209,15 +210,13 @@ | |
STATIC_URL = '/static/' | ||
|
||
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS | ||
STATICFILES_DIRS = ( | ||
str(APPS_DIR.path('static')), | ||
) | ||
STATICFILES_DIRS = [] | ||
|
||
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders | ||
STATICFILES_FINDERS = ( | ||
STATICFILES_FINDERS = [ | ||
'django.contrib.staticfiles.finders.FileSystemFinder', | ||
'django.contrib.staticfiles.finders.AppDirectoriesFinder', | ||
) | ||
] | ||
|
||
# MEDIA CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
|
@@ -257,12 +256,12 @@ | |
|
||
# AUTHENTICATION CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
AUTHENTICATION_BACKENDS = ( | ||
AUTHENTICATION_BACKENDS = [ | ||
"social_core.backends.openstreetmap_oauth2.OpenStreetMapOAuth2", | ||
"django.contrib.auth.backends.ModelBackend", | ||
) | ||
] | ||
|
||
SOCIAL_AUTH_PIPELINE = ( | ||
SOCIAL_AUTH_PIPELINE = [ | ||
'social_core.pipeline.social_auth.social_details', | ||
'social_core.pipeline.social_auth.social_uid', | ||
'social_core.pipeline.social_auth.auth_allowed', | ||
|
@@ -274,7 +273,7 @@ | |
'social_core.pipeline.social_auth.load_extra_data', | ||
'social_core.pipeline.user.user_details' | ||
# 'social_core.pipeline.social_auth.associate_by_email', | ||
) | ||
] | ||
|
||
# LOGGING CONFIGURATION | ||
# ------------------------------------------------------------------------------ | ||
|
Empty file.
This file was deleted.
Oops, something went wrong.
Empty file.
Empty file.
Binary file not shown.
Binary file not shown.
Empty file.
This file was deleted.
Oops, something went wrong.
Empty file.