From d4589280901d117ed4b7d5085fe26f27cdf4e99c Mon Sep 17 00:00:00 2001
From: arc-alex <ac@omnivox.dk>
Date: Wed, 16 Oct 2024 22:55:54 +0200
Subject: [PATCH] fix external path and remove unneeded stuff

---
 apps/server/src/setup/config.ts | 6 ++----
 apps/server/src/setup/index.ts  | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/server/src/setup/config.ts b/apps/server/src/setup/config.ts
index 625df64a3..c69b90eef 100644
--- a/apps/server/src/setup/config.ts
+++ b/apps/server/src/setup/config.ts
@@ -8,10 +8,8 @@ export const config = {
     directory: 'db',
     filename: 'db.json',
   },
-  demo: {
-    directory: 'demo',
-    filename: ['app.js', 'index.html', 'styles.css'],
-  },
+  external: 'external',
+  demo: 'demo',
   projects: 'projects',
   sheets: {
     directory: 'sheets',
diff --git a/apps/server/src/setup/index.ts b/apps/server/src/setup/index.ts
index fc9194f6e..619983187 100644
--- a/apps/server/src/setup/index.ts
+++ b/apps/server/src/setup/index.ts
@@ -73,7 +73,7 @@ export const srcDir = {
   /** Path to the react app */
   clientDir: isProduction ? join(srcDirectory, 'client/') : join(srcDirectory, '../../client/build/'),
   /** Path to the demo app */
-  demoDir: join(srcDirectory, 'external', config.demo.directory),
+  demoDir: join(srcDirectory, 'external', config.demo),
 } as const;
 
 export const srcFiles = {
@@ -109,12 +109,15 @@ export const publicDir = {
   /** path to uploads folder */
   uploadsDir: join(resolvePublicDirectory, config.uploads),
   /** path to external folder */
-  externalDir: externalsStartDirectory,
+  externalDir: join(
+    externalsStartDirectory,
+    isProduction ? config.external : '', // move to external folder in production
+  ),
   /** path to demo project folder */
   demoDir: join(
     externalsStartDirectory,
     isProduction ? '/external/' : '', // move to external folder in production
-    config.demo.directory,
+    config.demo,
   ),
   /** path to user folder */
   userDir: join(resolvePublicDirectory, config.user),