From 600a34b43ce66b35b69e180f224ade28f7872ff9 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:10:32 +0800
Subject: [PATCH] Fix

---
 package.json                 |  1 +
 server/model/status_page.js  |  4 ++--
 server/server.js             | 10 ++++++++--
 server/uptime-kuma-server.js |  4 ++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4814da6a..0164c29e 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
         "start": "npm run start-server",
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
+        "start-server-dev:test-subdir": "cross-env NODE_ENV=development BASE_PATH=/my-kuma node server/server.js",
         "build": "vite build --config ./config/vite.config.js",
         "test": "node test/prepare-test-server.js && npm run test-backend",
         "test-with-build": "npm run build && npm test",
diff --git a/server/model/status_page.js b/server/model/status_page.js
index e6095a63..41671529 100644
--- a/server/model/status_page.js
+++ b/server/model/status_page.js
@@ -282,9 +282,9 @@ class StatusPage extends BeanModel {
      */
     getIcon() {
         if (!this.icon) {
-            return "/icon.svg";
+            return "./icon.svg";
         } else {
-            return this.icon;
+            return "." + this.icon;
         }
     }
 
diff --git a/server/server.js b/server/server.js
index 90ac4f80..27c950eb 100644
--- a/server/server.js
+++ b/server/server.js
@@ -231,14 +231,14 @@ let needSetup = false;
             await StatusPage.handleStatusPageResponse(response, server.indexHTML, slug);
 
         } else if (uptimeKumaEntryPage && uptimeKumaEntryPage.startsWith("statusPage-")) {
-            response.redirect(server.basePath + "/status/" + uptimeKumaEntryPage.replace("statusPage-", ""));
+            response.redirect(server.basePath + "status/" + uptimeKumaEntryPage.replace("statusPage-", ""));
 
         } else {
             response.redirect(server.basePath + "dashboard");
         }
     });
 
-    app.get("/setup-database-info", (request, response) => {
+    mainRouter.get("/setup-database-info", (request, response) => {
         allowDevAllOrigin(response);
         response.json({
             runningSetup: false,
@@ -301,6 +301,12 @@ let needSetup = false;
 
     app.use(server.basePath, mainRouter);
 
+    if (server.basePath !== "/") {
+        app.get("/", (request, response) => {
+            response.status(404).send("Your Uptime Kuma is running at " + server.basePath);
+        });
+    }
+
     log.info("server", "Adding socket handler");
     io.on("connection", async (socket) => {
 
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 73ce2679..d551fd31 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -92,6 +92,10 @@ class UptimeKumaServer {
             basePathEnv = basePathEnv + "/";
         }
 
+        if (basePathEnv !== "/") {
+            log.info("server", "Base Path enabled: " + basePathEnv);
+        }
+
         this.basePath = basePathEnv;
 
         log.info("server", "Creating express and socket.io instance");