diff --git a/SAS/TMSS/backend/src/tmss/settings.py b/SAS/TMSS/backend/src/tmss/settings.py index 7e730fb87a92a049b49dec50722fd03cd67e1e21..c7ec0d335abba4f91ab90e9979cebf2f3f9e7248 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 088c0c4f28d1efe46c4da4b4edd21992e394ed65..e22c15b14c59cb62b64199e4ae8ae5181b0d409a 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 b20842bcefd3a4313c19ad5e7001a2f9b9175aac..2740ab26f83005b173599ecf78e562e3fc086057 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)