From 1c1b84b8a1d2ca0ab219ce348cfad1f2f5ac1b4a Mon Sep 17 00:00:00 2001
From: jkuensem <jkuensem@physik.uni-bielefeld.de>
Date: Wed, 18 Dec 2019 13:52:41 +0100
Subject: [PATCH] LEI-40: Updated routing config for serving LSMR
---
SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile | 2 +-
SAS/LSMR/docker/lsmr-testenv/nginx.conf | 2 +-
SAS/LSMR/frontend/frontend_poc/src/App.js | 2 +-
SAS/LSMR/frontend/frontend_poc/src/CycleList.js | 2 +-
SAS/LSMR/frontend/frontend_poc/src/ProjectList.js | 2 +-
SAS/LSMR/frontend/frontend_poc/src/index.js | 6 +++---
SAS/LSMR/src/lsmr/urls.py | 8 ++++----
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile b/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile
index a0892ac8004..dde6329fc17 100644
--- a/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile
+++ b/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
diff --git a/SAS/LSMR/docker/lsmr-testenv/nginx.conf b/SAS/LSMR/docker/lsmr-testenv/nginx.conf
index 6c84f08eda6..c00bf984dbd 100644
--- a/SAS/LSMR/docker/lsmr-testenv/nginx.conf
+++ b/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/;
}
diff --git a/SAS/LSMR/frontend/frontend_poc/src/App.js b/SAS/LSMR/frontend/frontend_poc/src/App.js
index 7705faf5a0b..63ed4f460f0 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/App.js
+++ b/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"
diff --git a/SAS/LSMR/frontend/frontend_poc/src/CycleList.js b/SAS/LSMR/frontend/frontend_poc/src/CycleList.js
index 64be5832749..e11294b74ae 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/CycleList.js
+++ b/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)
diff --git a/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js b/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js
index 0bd084fad58..5bbe56a535b 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js
+++ b/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)
diff --git a/SAS/LSMR/frontend/frontend_poc/src/index.js b/SAS/LSMR/frontend/frontend_poc/src/index.js
index e60f03d9e35..a809b448c60 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/index.js
+++ b/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>
)
diff --git a/SAS/LSMR/src/lsmr/urls.py b/SAS/LSMR/src/lsmr/urls.py
index c0eefc8e0ef..339f3c18485 100644
--- a/SAS/LSMR/src/lsmr/urls.py
+++ b/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'),
]
--
GitLab