From d8ee57920434bc699bc54b62bc5b980f0d4f8e25 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 25 Apr 2025 14:01:39 +0300
Subject: [PATCH] fix(nx/docker): icon, manifest & robots.txt

---
 apps/client/src/assets/.gitkeep                   |   0
 .../src/public => client/src/assets}/icon.png     | Bin
 .../src/assets}/manifest.webmanifest              |   0
 .../src/public => client/src/assets}/robots.txt   |   0
 apps/server/src/app.ts                            |  14 ++++++++------
 5 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 apps/client/src/assets/.gitkeep
 rename apps/{server/src/public => client/src/assets}/icon.png (100%)
 rename apps/{server/src/public => client/src/assets}/manifest.webmanifest (100%)
 rename apps/{server/src/public => client/src/assets}/robots.txt (100%)

diff --git a/apps/client/src/assets/.gitkeep b/apps/client/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apps/server/src/public/icon.png b/apps/client/src/assets/icon.png
similarity index 100%
rename from apps/server/src/public/icon.png
rename to apps/client/src/assets/icon.png
diff --git a/apps/server/src/public/manifest.webmanifest b/apps/client/src/assets/manifest.webmanifest
similarity index 100%
rename from apps/server/src/public/manifest.webmanifest
rename to apps/client/src/assets/manifest.webmanifest
diff --git a/apps/server/src/public/robots.txt b/apps/client/src/assets/robots.txt
similarity index 100%
rename from apps/server/src/public/robots.txt
rename to apps/client/src/assets/robots.txt
diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index 5510e3db4..43170e0bd 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -6,7 +6,7 @@ import helmet from "helmet";
 import compression from "compression";
 import sessionParser from "./routes/session_parser.js";
 import config from "./services/config.js";
-import utils from "./services/utils.js";
+import utils, { getResourceDir } from "./services/utils.js";
 import assets from "./routes/assets.js";
 import routes from "./routes/routes.js";
 import custom from "./routes/custom.js";
@@ -64,6 +64,8 @@ export default async function buildApp() {
         console.log("Database not initialized yet. LLM features will be initialized after setup.");
     }
 
+    const publicDir = path.join(getResourceDir(), "public");
+    const publicAssetsDir = path.join(publicDir, "assets");
     const assetsDir = RESOURCE_DIR;
 
     // view engine setup
@@ -105,12 +107,12 @@ export default async function buildApp() {
     app.use(express.urlencoded({ extended: false }));
     app.use(cookieParser());
 
-    app.use(express.static(path.join(assetsDir, "public/root")));
-    app.use(`/manifest.webmanifest`, express.static(path.join(assetsDir, "public/manifest.webmanifest")));
-    app.use(`/robots.txt`, express.static(path.join(assetsDir, "public/robots.txt")));
-    app.use(`/icon.png`, express.static(path.join(assetsDir, "public/icon.png")));
+    app.use(express.static(path.join(publicDir, "root")));
+    app.use(`/manifest.webmanifest`, express.static(path.join(publicAssetsDir, "manifest.webmanifest")));
+    app.use(`/robots.txt`, express.static(path.join(publicAssetsDir, "robots.txt")));
+    app.use(`/icon.png`, express.static(path.join(publicAssetsDir, "icon.png")));
     app.use(sessionParser);
-    app.use(favicon(`${assetsDir}/icon.ico`));
+    app.use(favicon(path.join(assetsDir, "icon.ico")));
 
     if (openID.isOpenIDEnabled())
         app.use(auth(openID.generateOAuthConfig()));