Changed url from fronted_poc to frontend

SAS/TMSS/docker/tmss-nginxenv/nginx.conf

@@ -18,11 +18,11 @@ http {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Host $server_name;
 
-
     location / {
       try_files $uri @proxy_to_app;
     }
 
+
     location /static/ {
       alias /staticfiles/;
    }
@@ -37,7 +37,4 @@ http {
     }
   }
 
-}
-
-
-
+}
\ No newline at end of file

SAS/TMSS/docker/tmss-nginxenv/tmss_testenv_Dockerfile

@@ -38,11 +38,13 @@ USER root
 
 RUN  mkdir /staticfiles; chown -R postgres:postgres /staticfiles
 
+ENV VARIANT gnucxx11_opt
+
+
 RUN mv /tmp/lofar /lofar && \
     cd /lofar && \
     . CMake/gen_LofarPackageList_cmake.sh && \
     PACKAGE=TMSS  && \
-    VARIANT=gnucxx11_opt  && \
     echo "Building $PACKAGE..."  && \
     mkdir -p build/$VARIANT  && \
     cd build/$VARIANT  && \
@@ -65,10 +67,7 @@ RUN echo  -e "ALLOWED_HOSTS=['*']\n" >> /lofar/build/gnucxx11_opt/installed/lib6
 
 RUN echo -e "STATIC_URL = '/static/'\n"  >> /lofar/build/gnucxx11_opt/installed/lib64/python3.6/site-packages/lofar/sas/tmss/tmss/settings.py
 RUN echo -e "STATIC_ROOT = '/staticfiles/'\n" >> /lofar/build/gnucxx11_opt/installed/lib64/python3.6/site-packages/lofar/sas/tmss/tmss/settings.py
-
-ENV VARIANT gnucxx11_opt
-#RUN echo -e "STATICFILES_DIRS = ['/lofar/build/$VARIANT/installed/lib64/python3.6/site-packages/lofar/sas/frontend/frontend_poc/build/static/']\n" >> /lofar/build/gnucxx11_opt/installed/lib64/python3.6/site-packages/lofar/sas/tmss/tmss/settings.py
-
+RUN echo -e "STATICFILES_DIRS = ['/lofar/build/$VARIANT/installed/lib64/python3.6/site-packages/lofar/sas/frontend/frontend_poc/build/static/']\n" >> /lofar/build/gnucxx11_opt/installed/lib64/python3.6/site-packages/lofar/sas/tmss/tmss/settings.py
 
 
 ENV POSTGRES_PORT=5444
@@ -77,10 +76,7 @@ ENV POSTGRES_PASSWORD=test
 ENV POSTGRES_USER=test_tmss_user
 ENV POSTGRES_HOST=localhost
 
-
-
-
-
+RUN /bin/bash -c 'export VARIANT=gnucxx11_opt; source /lofar/build/$VARIANT/lofarinit.sh; /usr/bin/python3 /lofar/build/$VARIANT/installed/lib64/python3.6/site-packages/lofar/sas/tmss/manage.py collectstatic --clear'
 RUN /bin/bash -c 'export VARIANT=gnucxx11_opt; source /lofar/build/$VARIANT/lofarinit.sh; /usr/bin/python3 /lofar/build/$VARIANT/installed/lib64/python3.6/site-packages/lofar/sas/tmss/manage.py collectstatic --noinput'
 
 

SAS/TMSS/frontend/frontend_poc/src/index.js

@@ -12,6 +12,7 @@ import { Route, Link, BrowserRouter as Router } from 'react-router-dom'
 const routing = (
   <Router>
     <div>
+      <h1>Frontend POC</h1>
       <Route exact path="/frontend/" component={App} />
       <Route path="/frontend/cycle" component={CycleList} />
       <Route path="/frontend/project" component={ProjectList} />

SAS/TMSS/src/tmss/urls.py

@@ -159,6 +159,6 @@ frontend_urlpatterns = [
 
 # prefix everything for proxy
 #urlpatterns = [url(r'^api/', include(urlpatterns)), url(r'^oidc/', include('mozilla_django_oidc.urls')),]
-urlpatterns = [url(r'^api/', include(urlpatterns)), url(r'^oidc/', include('mozilla_django_oidc.urls')), url(r'^frontend_poc/', include(frontend_urlpatterns)) ,]
+urlpatterns = [url(r'^api/', include(urlpatterns)), url(r'^oidc/', include('mozilla_django_oidc.urls')), url(r'^frontend/', include(frontend_urlpatterns)) ,]