From 3c4c774af8b02015e5ff20d2b7fd5176a60a6ca9 Mon Sep 17 00:00:00 2001 From: Rachele Morino Date: Thu, 14 Apr 2022 16:48:54 -0400 Subject: [PATCH 1/2] Make taui assets accessible for django-spa --- docker-compose.yml | 1 + src/backend/echo/settings.py | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0ae7afaa..56b1322b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: volumes: - ./src/backend:/usr/local/src/backend - $HOME/.aws:/root/.aws:ro + - ./taui/assets:/usr/local/src/backend/static/assets working_dir: /usr/local/src/backend depends_on: database: diff --git a/src/backend/echo/settings.py b/src/backend/echo/settings.py index 53d4c2a1..6a4d7e94 100644 --- a/src/backend/echo/settings.py +++ b/src/backend/echo/settings.py @@ -149,6 +149,7 @@ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') +STATICFILES_DIRS = ((os.path.join(STATIC_ROOT, 'assets')),) # Set the django-spa static file storage: STATICFILES_STORAGE = 'spa.storage.SPAStaticFilesStorage' From 507493c30f8885220ee64031a3e57986ffca6052 Mon Sep 17 00:00:00 2001 From: Rachele Morino Date: Fri, 15 Apr 2022 08:11:55 -0400 Subject: [PATCH 2/2] Edit to bring index.html into django --- docker-compose.yml | 1 + src/backend/echo/settings.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 56b1322b..79dd9c11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: - ./src/backend:/usr/local/src/backend - $HOME/.aws:/root/.aws:ro - ./taui/assets:/usr/local/src/backend/static/assets + - ./taui/index.html:/usr/local/src/backend/static/index.html working_dir: /usr/local/src/backend depends_on: database: diff --git a/src/backend/echo/settings.py b/src/backend/echo/settings.py index 6a4d7e94..53d4c2a1 100644 --- a/src/backend/echo/settings.py +++ b/src/backend/echo/settings.py @@ -149,7 +149,6 @@ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') -STATICFILES_DIRS = ((os.path.join(STATIC_ROOT, 'assets')),) # Set the django-spa static file storage: STATICFILES_STORAGE = 'spa.storage.SPAStaticFilesStorage'