From 62f209a99d853d26327b3be2a7289337fc06ecb3 Mon Sep 17 00:00:00 2001
From: Filip Krumpe <filip.krumpe@posteo.de>
Date: Mon, 20 May 2024 13:21:44 +0200
Subject: [PATCH] Make the python server interact correctly

---
 app.py                       |  6 +++++-
 webapp/package-lock.json     | 11 +++++++++++
 webapp/package.json          |  1 +
 webapp/src/routes/+layout.ts |  1 +
 webapp/svelte.config.js      |  4 ++--
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 webapp/src/routes/+layout.ts

diff --git a/app.py b/app.py
index aeb75a5..8326192 100644
--- a/app.py
+++ b/app.py
@@ -2,6 +2,10 @@ from flask import Flask, send_from_directory
 
 app = Flask(__name__)
 
+@app.route("/")
+def svelte_index():
+    return send_from_directory("webapp/build", "index.html")
+
 @app.route("/<path:path>")
 def svelte_client(path):
-    return send_from_directory("webapp/public/", path)
\ No newline at end of file
+    return send_from_directory("webapp/build/", path)
\ No newline at end of file
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 2fa81bd..957c63f 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "0.0.1",
 			"devDependencies": {
 				"@sveltejs/adapter-auto": "^3.0.0",
+				"@sveltejs/adapter-static": "^3.0.1",
 				"@sveltejs/kit": "^2.0.0",
 				"@sveltejs/vite-plugin-svelte": "^3.0.0",
 				"@types/eslint": "^8.56.0",
@@ -910,6 +911,16 @@
 				"@sveltejs/kit": "^2.0.0"
 			}
 		},
+		"node_modules/@sveltejs/adapter-static": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.1.tgz",
+			"integrity": "sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"@sveltejs/kit": "^2.0.0"
+			}
+		},
 		"node_modules/@sveltejs/kit": {
 			"version": "2.5.9",
 			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.9.tgz",
diff --git a/webapp/package.json b/webapp/package.json
index a183a9f..c07f201 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -13,6 +13,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/adapter-static": "^3.0.1",
 		"@sveltejs/kit": "^2.0.0",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@types/eslint": "^8.56.0",
diff --git a/webapp/src/routes/+layout.ts b/webapp/src/routes/+layout.ts
new file mode 100644
index 0000000..c8cacf0
--- /dev/null
+++ b/webapp/src/routes/+layout.ts
@@ -0,0 +1 @@
+export const prerender = true;
\ No newline at end of file
diff --git a/webapp/svelte.config.js b/webapp/svelte.config.js
index 4a82086..cb6d245 100644
--- a/webapp/svelte.config.js
+++ b/webapp/svelte.config.js
@@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
@@ -11,7 +11,7 @@ const config = {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
 		// See https://kit.svelte.dev/docs/adapters for more information about adapters.
-		adapter: adapter()
+		adapter: adapter(),
 	}
 };