From 90f76b7387b9e0eecf4c2f6c3770ebe1975d7c21 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 28 Jan 2021 19:30:03 +0100
Subject: [PATCH] TMSS-595: frontend template static paths
---
SAS/TMSS/backend/src/tmss/settings.py | 4 ++--
SAS/TMSS/backend/src/tmss/tmssapp/views.py | 2 +-
SAS/TMSS/frontend/tmss_webapp/CMakeLists.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/settings.py b/SAS/TMSS/backend/src/tmss/settings.py
index 7e730fb87a9..c7ec0d335ab 100644
--- a/SAS/TMSS/backend/src/tmss/settings.py
+++ b/SAS/TMSS/backend/src/tmss/settings.py
@@ -133,7 +133,7 @@ ROOT_URLCONF = 'lofar.sas.tmss.tmss.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [BASE_DIR, os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, '../../frontend','tmss_webapp')],
+ 'DIRS': [BASE_DIR, os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'frontend','tmss_webapp')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -147,7 +147,7 @@ TEMPLATES = [
]
STATICFILES_DIRS = [
- os.path.join(BASE_DIR, '../../frontend','tmss_webapp/build/static')
+ os.path.join(BASE_DIR, 'frontend','tmss_webapp/build/static')
]
WSGI_APPLICATION = 'lofar.sas.tmss.tmss.wsgi.application'
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/views.py b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
index 088c0c4f28d..e22c15b14c5 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/views.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
@@ -41,7 +41,7 @@ def subtask_parset(request, subtask_pk:int):
def index(request):
- return render(request, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), '../../../frontend','tmss_webapp/build/index.html'))
+ return render(request, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), '../frontend','tmss_webapp/build/index.html'))
#return render(request, "../../../frontend/frontend_poc/build/index.html")
diff --git a/SAS/TMSS/frontend/tmss_webapp/CMakeLists.txt b/SAS/TMSS/frontend/tmss_webapp/CMakeLists.txt
index b20842bcefd..2740ab26f83 100644
--- a/SAS/TMSS/frontend/tmss_webapp/CMakeLists.txt
+++ b/SAS/TMSS/frontend/tmss_webapp/CMakeLists.txt
@@ -1,2 +1,2 @@
include(NPMInstall)
-npm_install(package.json PUBLIC public SOURCE src DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/frontend/tmss_webapp/build)
+npm_install(package.json PUBLIC public SOURCE src DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/tmss/frontend/tmss_webapp/build)
--
GitLab