Staging (#36)

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:

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')
-

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'
 ]

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')),
 ]

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

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:

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