diff --git a/README.md b/README.md index 3ab4ef3..75017ea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# fediverse.space -fediverse.space is a tool to explore instances in the fediverse 🌐 +# fediverse.space 🌐 [![Netlify Status](https://api.netlify.com/api/v1/badges/ddc939c0-c12f-4e0e-8ca3-cf6abe8b9a5a/deploy-status)](https://app.netlify.com/sites/sharp-curran-4b66d3/deploys) +The map of the fediverse that you always wanted. ## Requirements - For everything: diff --git a/backend/api/backend/settings/base.py b/backend/api/backend/settings/base.py index e345598..c24fcff 100644 --- a/backend/api/backend/settings/base.py +++ b/backend/api/backend/settings/base.py @@ -120,8 +120,5 @@ USE_TZ = False # https://docs.djangoproject.com/en/2.1/howto/static-files/ STATIC_URL = '/static/' -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, '../../frontend/build/static') -] +STATICFILES_DIRS = [] STATIC_ROOT = os.path.join(BASE_DIR, 'static') - diff --git a/backend/api/backend/settings/dev.py b/backend/api/backend/settings/development.py similarity index 100% rename from backend/api/backend/settings/dev.py rename to backend/api/backend/settings/development.py diff --git a/backend/api/backend/settings/production.py b/backend/api/backend/settings/production.py index e5a56c3..c4539a3 100644 --- a/backend/api/backend/settings/production.py +++ b/backend/api/backend/settings/production.py @@ -2,8 +2,10 @@ from .base import * DEBUG = False -ALLOWED_HOSTS = ['fediverse.space'] +ALLOWED_HOSTS = ['fediverse.space', 'www.fediverse.space', 'staging.fediverse.space'] CORS_ORIGIN_WHITELIST = [ 'fediverse.space', + 'www.fediverse.space', + 'staging.fediverse.space' ] diff --git a/backend/api/backend/urls.py b/backend/api/backend/urls.py index 9510429..b77c246 100644 --- a/backend/api/backend/urls.py +++ b/backend/api/backend/urls.py @@ -34,5 +34,4 @@ router.register(r'graph/edges', views.EdgeView, base_name='edge') urlpatterns = [ path('api/v1/', include(router.urls)), path('silk/', include('silk.urls', namespace='silk')), - path('', TemplateView.as_view(template_name='index.html')), ] diff --git a/backend/api/requirements.txt b/backend/api/requirements.txt index 3493071..0365321 100644 --- a/backend/api/requirements.txt +++ b/backend/api/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.3.5 certifi==2018.8.24 chardet==3.0.4 dill==0.2.5 -Django==2.1.3 +Django==2.1.7 django-bulk-update==2.2.0 django-cors-headers==2.4.0 django-letsencrypt==3.0.1 diff --git a/docker-compose.yml b/docker-compose.yml index 0acaf44..74dccd2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - POSTGRES_PASSWORD - POSTGRES_DB - DJANGO_SETTINGS_MODULE + - ENVIRONMENT=development build: ./backend/api command: bash scripts/docker-entrypoint.sh volumes: diff --git a/example.env b/example.env index f3867ba..4abeff1 100644 --- a/example.env +++ b/example.env @@ -2,4 +2,4 @@ SECRET_KEY=a-long-secret-key POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres POSTGRES_DB=fediverse -DJANGO_SETTINGS_MODULE=backend.settings.dev +DJANGO_SETTINGS_MODULE=backend.settings.development