From 5b268363990a316aadb467ec58e6dab6dbb30073 Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Wed, 6 May 2026 17:51:10 -0400
Subject: [PATCH] 05/06 Phase 2: fixed error 500 Internal Server Error 2

---
 app/admin/__init__.py  | 11 ++++++++---
 app/tenant/__init__.py | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/admin/__init__.py b/app/admin/__init__.py
index e3dd691..a2bf660 100644
--- a/app/admin/__init__.py
+++ b/app/admin/__init__.py
@@ -13,10 +13,15 @@ logger = logging.getLogger(__name__)
 
 
 def create_admin_app(config_override=None):
+    import os as _os
+    # Resolve paths relative to this file to avoid CWD-dependent behaviour.
+    # app/admin/__init__.py  →  ../../templates  =  <project_root>/templates
+    _here = _os.path.dirname(_os.path.abspath(__file__))
+    _root = _os.path.normpath(_os.path.join(_here, "..", ".."))
     flask_app = Flask(
         __name__,
-        template_folder="../templates",
-        static_folder="../static/admin",
+        template_folder=_os.path.join(_root, "templates"),
+        static_folder=_os.path.join(_root, "static", "admin"),
         static_url_path="/static",
     )
 
@@ -87,4 +92,4 @@ def create_admin_app(config_override=None):
     import app.models  # noqa: F401
 
     logger.info("Admin app created (env=%s)", flask_app.config.get("FLASK_ENV"))
-    return flask_app
+    return flask_app
\ No newline at end of file
diff --git a/app/tenant/__init__.py b/app/tenant/__init__.py
index e77795d..fc2351f 100644
--- a/app/tenant/__init__.py
+++ b/app/tenant/__init__.py
@@ -18,10 +18,15 @@ logger = logging.getLogger(__name__)
 
 
 def create_tenant_app(config_override=None):
+    import os as _os
+    # Resolve paths relative to this file to avoid CWD-dependent behaviour.
+    # app/tenant/__init__.py  →  ../../templates  =  <project_root>/templates
+    _here = _os.path.dirname(_os.path.abspath(__file__))
+    _root = _os.path.normpath(_os.path.join(_here, "..", ".."))
     flask_app = Flask(
         __name__,
-        template_folder="../templates",
-        static_folder="../static/tenant",
+        template_folder=_os.path.join(_root, "templates"),
+        static_folder=_os.path.join(_root, "static", "tenant"),
         static_url_path="/static",
     )
 
@@ -102,4 +107,4 @@ def create_tenant_app(config_override=None):
     import app.models  # noqa: F401
 
     logger.info("Tenant app created (env=%s)", flask_app.config.get("FLASK_ENV"))
-    return flask_app
+    return flask_app
\ No newline at end of file