LEI-40: Updated routing config for serving LSMR

SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile

@@ -60,5 +60,5 @@ ENTRYPOINT /bin/bash -c 'export VARIANT=gnucxx11_opt; \
            lsmr_testdatabase & \
            sleep 15 && \
            lsmr & \
-           cd /lofar/build/gnucxx11_opt/SAS/LSMR/frontend/frontend_poc && \
+           cd /lofar/build/gnucxx11_opt/installed/share/www && \
            npm start'
\ No newline at end of file

SAS/LSMR/docker/lsmr-testenv/nginx.conf

@@ -29,7 +29,7 @@ http {
       proxy_pass http://lsmr_test:3000$uri;
     }
 
-    location / {
+    location /api/ {
       proxy_pass http://lsmr_test:8000/;
     }
 

SAS/LSMR/frontend/frontend_poc/src/App.js

@@ -8,7 +8,7 @@ function App() {
       <header className="App-header">
         <img src={logo} className="App-logo" alt="logo" />
         <p>
-          Navigate to <a href='/api/cycle/'>Cycles</a> or <a href='/api/project/'>Projects</a>.
+          Navigate to <a href='/frontend/cycle/'>Cycles</a> or <a href='/frontend/project/'>Projects</a>.
         </p>
         <a
           className="App-link"

SAS/LSMR/frontend/frontend_poc/src/CycleList.js

@@ -8,7 +8,7 @@ var headers = new Headers();
 headers.append('Authorization', 'Basic ' + btoa('paulus:pauluspass'));
 headers.append('Content-Type', 'application/json');
 
-var api_url = '/'
+var api_url = '/api/'
 
 function lsmrGetList(url, component){
    console.log('Getting '+ url)

SAS/LSMR/frontend/frontend_poc/src/ProjectList.js

@@ -9,7 +9,7 @@ var headers = new Headers();
 headers.append('Authorization', 'Basic ' + btoa('paulus:pauluspass'));
 headers.append('Content-Type', 'application/json');
 
-var api_url = '/'
+var api_url = '/app/'
 
 function lsmrGetList(url, component){
    console.log('Getting '+ url)

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

@@ -11,9 +11,9 @@ import { Route, Link, BrowserRouter as Router } from 'react-router-dom'
 const routing = (
   <Router>
     <div>
-      <Route exact path="/" component={App} />
-      <Route path="/cycle" component={CycleList} />
-      <Route path="/project" component={ProjectList} />
+      <Route exact path="/frontend/" component={App} />
+      <Route path="/frontend/cycle" component={CycleList} />
+      <Route path="/frontend/project" component={ProjectList} />
     </div>
   </Router>
 )

SAS/LSMR/src/lsmr/urls.py

@@ -44,11 +44,11 @@ swagger_schema_view = get_schema_view(
 )
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('docs/', include_docs_urls(title='LSMR API')),
+    path('api/admin/', admin.site.urls),
+    path('api/docs/', include_docs_urls(title='LSMR API')),
     re_path(r'^swagger(?P<format>\.json|\.yaml)$', swagger_schema_view.without_ui(cache_timeout=0), name='schema-json'),
-    path('swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    path('redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+    path('api/swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+    path('api/redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
 ]