From 37f11dc23af4eaa4210f712c5d03e0d5c94cbb7b Mon Sep 17 00:00:00 2001
From: tuanOts <anhtuanbtx1@gmail.com>
Date: Sun, 25 May 2025 02:11:19 +0700
Subject: [PATCH] Fix asset paths and routing issues

- Fix asset paths from /react/templateassets/ to /react/assets/
- Fix missing slash in asset paths (/reactassets/ to /react/assets/)
- Update environment.jsx to ensure base_path always has trailing slash
- Fix BrowserRouter basename configuration
- Update Header.jsx exclusionArray paths
- Fix themeSettings and rightSidebar asset paths
---
 src/InitialPage/Sidebar/Header.jsx                   | 4 ++--
 src/InitialPage/themeSettings.jsx                    | 2 +-
 src/core/img/imagewithbasebath.jsx                   | 2 +-
 src/environment.jsx                                  | 3 ++-
 src/feature-module/components/rightSidebar/index.jsx | 2 +-
 src/index.js                                         | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/InitialPage/Sidebar/Header.jsx b/src/InitialPage/Sidebar/Header.jsx
index 4fce5fa..04b46e9 100644
--- a/src/InitialPage/Sidebar/Header.jsx
+++ b/src/InitialPage/Sidebar/Header.jsx
@@ -116,8 +116,8 @@ const Header = () => {
   let pathname = location.pathname;
 
   const exclusionArray = [
-    "/reactjs/template/dream-pos/index-three",
-    "/reactjs/template/dream-pos/index-one",
+    "/reactjs/dream-pos/index-three",
+    "/reactjs/dream-pos/index-one",
   ];
   if (exclusionArray.indexOf(window.location.pathname) >= 0) {
     return "";
diff --git a/src/InitialPage/themeSettings.jsx b/src/InitialPage/themeSettings.jsx
index 78d6dd8..2261434 100644
--- a/src/InitialPage/themeSettings.jsx
+++ b/src/InitialPage/themeSettings.jsx
@@ -257,7 +257,7 @@ const ThemeSettings = () => {
                               />
                               <label htmlFor="rtl" className="checktoggles">
                                 <Link
-                                  to="https://dreamspos.dreamstechnologies.com/react/template-rtl/"
+                                  to="https://dreamspos.dreamstechnologies.com/react/"
                                   target="_blank"
                                 >
                                   <ImageWithBasePath
diff --git a/src/core/img/imagewithbasebath.jsx b/src/core/img/imagewithbasebath.jsx
index a779de7..1b8de39 100644
--- a/src/core/img/imagewithbasebath.jsx
+++ b/src/core/img/imagewithbasebath.jsx
@@ -16,7 +16,7 @@ const ImageWithBasePath = (props) => {
   }
 
   // For debugging - remove in production
-  // console.log('Image path:', fullSrc);
+  // console.log('Base path:', base_path, 'Src:', props.src, 'Full path:', fullSrc);
 
   return (
     <img
diff --git a/src/environment.jsx b/src/environment.jsx
index ba740fd..89f76ce 100644
--- a/src/environment.jsx
+++ b/src/environment.jsx
@@ -1,5 +1,6 @@
 // For development environment
-export const base_path = process.env.PUBLIC_URL || "/react/";
+const publicUrl = process.env.PUBLIC_URL || "/";
+export const base_path = publicUrl.endsWith('/') ? publicUrl : publicUrl + '/';
 
 // For production with a subdirectory (uncomment and modify as needed)
 // export const base_path = "/react/";
diff --git a/src/feature-module/components/rightSidebar/index.jsx b/src/feature-module/components/rightSidebar/index.jsx
index 616b5a1..05b9f35 100644
--- a/src/feature-module/components/rightSidebar/index.jsx
+++ b/src/feature-module/components/rightSidebar/index.jsx
@@ -172,7 +172,7 @@ const RightSideBar = () => {
                       <input type="checkbox" id={1} className="check" />
                       <label htmlFor={1} className="checktoggle">
                         <Link
-                          to="https://dreamspos.dreamguystech.com/react/template-rtl/dashboard"
+                          to="https://dreamspos.dreamguystech.com/react/dashboard"
                           className="layout-link"
                         >
                           checkbox
diff --git a/src/index.js b/src/index.js
index 368a95e..08bf028 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,7 +25,7 @@ if (rootElement) {
   root.render(
     <React.StrictMode>
     <Provider store={store} >
-      <BrowserRouter basename={base_path}>
+      <BrowserRouter basename={process.env.PUBLIC_URL}>
       <AllRoutes />
 
       </BrowserRouter>