restructure repo: server is now separate folder

Dockerfile_proxy

@@ -1,4 +1,3 @@
 FROM nginx
-COPY caroline/html_dist /usr/share/nginx/html/caroline/
-COPY caroline/html_dist/index.html /usr/share/nginx/html/.
+COPY caroline/html/caroline/ /usr/share/nginx/html/caroline/
 COPY roundtable.conf /etc/nginx/conf.d/default.conf

build_containers.sh

@@ -4,4 +4,4 @@ echo "Build proxy image"
 podman build -f Dockerfile_proxy -t roundtable_proxy
 
 echo "Build application server"
-podman build -f caroline/server/Dockerfile -t roundtable_application
+podman build -f server/Dockerfile -t roundtable_application

caroline/html/index.html

@@ -205,7 +205,7 @@ <h2 id="confirmmessage"></h2>
 		import { initRoundTable, initApp, enabaleProceed, disableProceed } from './js/caroline.js';
 		import YAML from 'yaml';
 
-		var initDataLocation = './init_data.yaml';
+		var initDataLocation = './caroline/init_data.yaml';
 		const queryString = window.location.search;
 		const urlParams = new URLSearchParams(queryString);
 		if (urlParams.has('load')){

caroline/html/init_data.yaml

@@ -9,6 +9,7 @@ leftHanded: false
 drawingHelp: dots
 drawingHelpIntensity: 0.06
 roundTableCallBack: 
+#roundTableServer: http://localhost:8001
 roundTableServer: https://roundtable.researchx3d.com/
 roundTableAuth: ''
 roundTableExit: 

caroline/html/package.json

@@ -6,7 +6,8 @@
     "build": "parcel build --no-scope-hoist --public-url ../caroline --dist-dir ./caroline/"
   },
   "staticFiles": {
-    "staticPath": "./init_data.yaml"
+    "staticPath": "./init_data.yaml",
+    "outputDir": "/caroline"
   },
   "devDependencies": {
     "@parcel/compressor-brotli": "^2.13.3",

roundtable.conf

@@ -12,10 +12,10 @@ server {
   gzip_vary on;
   gzip_min_length 10240;
   gzip_types text/css text/javascript application/x-javascript;
-
+  gzip_static on;
 
   location / {
-    index index.html;
+    index caroline/index.html;
     gzip on;
     gzip_types application/json;
     gzip_static on;