Make dev and prod routes consistent

docker-compose.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   mongodb:
     image: 'mongo'
@@ -10,7 +9,7 @@ services:
   backend:
     build: ./nomad-rest-api
     env_file:
-      - ./env/backend.env
+      - ./env-example/backend.env
     ports:
       - '8080:8080'
     volumes:
@@ -24,7 +23,7 @@ services:
   frontend:
     build: ./nomad-front-end
     env_file:
-      - ./env/frontend.env
+      - ./env-example/frontend.env
     ports:
       - '3003:3003'
     volumes:

env-example/frontend.env

@@ -1,7 +1,7 @@
-VITE_API_URL=http://localhost:8080
+VITE_API_URL=http://localhost:8080/api
 VITE_NMRIUM_URL=http://localhost:3000
 
 #Set true if corresponding NOMAD modules are used
 VITE_SUBMIT_ON=true
 VITE_BATCH_SUBMIT_ON=true
-VITE_DATASTORE_ON=true
+VITE_DATASTORE_ON=true

nginx.conf

@@ -52,7 +52,7 @@ http {
         }
 
         location /api/ {
-          proxy_pass http://api:8080/;
+          proxy_pass http://api:8080;
        }
 
 	    location /data/ {
@@ -68,15 +68,15 @@ http {
 	    proxy_set_header Upgrade $http_upgrade;
 	    proxy_set_header Connection "upgrade";
 
-        proxy_pass http://api:8080/socket.io/;	
+        proxy_pass http://api:8080/socket.io/;
 	    }
 
         location /downloads {
             alias /app/downloads;
         }
 
-        
-   
+
+
         error_page 404 /404.html;
         location = /404.html {
         }
@@ -88,4 +88,3 @@ http {
 
 
 }
-

nginx.conf-tls

@@ -70,7 +70,7 @@ http {
         }
 
         location /api/ {
-          proxy_pass http://api:8080/;
+          proxy_pass http://api:8080;
        }
 
         location /socket.io/ {
@@ -97,4 +97,3 @@ http {
     }
 
 }
-

nomad-rest-api/app.js

@@ -42,24 +42,24 @@ app.use((req, res, next) => {
   next()
 })
 
-app.use('/tracker', trackerRoutes)
-app.use('/admin/instruments', instrumentsRoutes)
-app.use('/dash', dashRoutes)
-app.use('/auth', authRoutes)
-app.use('/submit', submitRoutes)
-app.use('/admin/users', usersRoutes)
-app.use('/admin/groups', groupsRoutes)
-app.use('/admin/history', historyRoutes)
-app.use('/admin/param-sets', paramSetsRoutes)
-app.use('/admin/accounts', accountsRoutes)
-app.use('/admin/message', messageRoutes)
-app.use('/batch-submit', batchSubmitRoutes)
-app.use('/data', dataRoutes)
-app.use('/search', searchRoutes)
-app.use('/claims', claimRoutes)
-app.use('/datasets', datasetsRoutes)
-app.use('/stats', statsRoutes)
-app.use('/collections', collectionRoutes)
+app.use('/api/tracker', trackerRoutes)
+app.use('/api/admin/instruments', instrumentsRoutes)
+app.use('/api/dash', dashRoutes)
+app.use('/api/auth', authRoutes)
+app.use('/api/submit', submitRoutes)
+app.use('/api/admin/users', usersRoutes)
+app.use('/api/admin/groups', groupsRoutes)
+app.use('/api/admin/history', historyRoutes)
+app.use('/api/admin/param-sets', paramSetsRoutes)
+app.use('/api/admin/accounts', accountsRoutes)
+app.use('/api/admin/message', messageRoutes)
+app.use('/api/batch-submit', batchSubmitRoutes)
+app.use('/api/data', dataRoutes)
+app.use('/api/search', searchRoutes)
+app.use('/api/claims', claimRoutes)
+app.use('/api/datasets', datasetsRoutes)
+app.use('/api/stats', statsRoutes)
+app.use('/api/collections', collectionRoutes)
 
 app.use((req, res) => {
   res.status(404).send()