From 336147b371721433d6f90d1a6d57e2271692d495 Mon Sep 17 00:00:00 2001
From: Anil Natha <Anil.Natha@jpl.nasa.gov>
Date: Tue, 17 Dec 2024 10:07:46 -0800
Subject: [PATCH 1/2] Updated application to use BrowserRouter instead of
 HashRouter to improve the structure of our URLs.

---
 etc/apache2/sites-available/unity-ui.conf | 6 +++++-
 src/main.tsx                              | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/etc/apache2/sites-available/unity-ui.conf b/etc/apache2/sites-available/unity-ui.conf
index 74a9458..ef9f324 100644
--- a/etc/apache2/sites-available/unity-ui.conf
+++ b/etc/apache2/sites-available/unity-ui.conf
@@ -13,10 +13,14 @@
     Header add Set-Cookie oidc_claim_email=%{OIDC_CLAIM_EMAIL}e;Domain=${ENV_UNITY_UI_WWW_DOMAIN};Path=/;SameSite=strict;
 
     <Directory /var/www/unity-ui/>
+
        Options -Indexes
        AllowOverride All
        Order allow,deny
-       allow from all
+       Allow from all
+
+       FallbackResource /index.html
+
     </Directory>
 
 </VirtualHost>
diff --git a/src/main.tsx b/src/main.tsx
index ff43d5b..92c978e 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,19 +1,20 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import { HashRouter, Routes, Route } from 'react-router-dom'
+import { BrowserRouter, Routes, Route } from 'react-router-dom'
 import { HelmetProvider } from 'react-helmet-async'
 import AuthorizationWrapper from './AuthorizationWrapper'
+import Config from "./Config"
 
 import './index.css'
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   <React.StrictMode>
     <HelmetProvider>
-      <HashRouter>
+      <BrowserRouter basename={`${Config['general']['project']}/${Config['general']['venue']}/dashboard`}>
         <Routes>
           <Route path="*" Component={AuthorizationWrapper}/>
         </Routes>
-      </HashRouter>
+      </BrowserRouter>
     </HelmetProvider>
   </React.StrictMode>
 )

From fea8c6b0aebe90b3de23587d77a984c56b4ccc1d Mon Sep 17 00:00:00 2001
From: Anil Natha <Anil.Natha@jpl.nasa.gov>
Date: Tue, 17 Dec 2024 10:10:31 -0800
Subject: [PATCH 2/2] Updated homepage so that it exists at /home and anytime
 the path at "/" is visited, it redirects to "/home".

---
 src/Root.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Root.tsx b/src/Root.tsx
index d23561f..3a1df5d 100644
--- a/src/Root.tsx
+++ b/src/Root.tsx
@@ -1,4 +1,5 @@
 import {
+  Navigate,
   Route,
   Routes,
 } from "react-router-dom"
@@ -28,7 +29,6 @@ function Root() {
 
   useEffect(() => {
 
-
     if (healthState.status === "idle") {
       // Fetch the health data
       dispatch(getHealthData());
@@ -72,9 +72,9 @@ function Root() {
                 return <Route key={index} path={"/applications/" + formatRoute(item.componentName)} element={<WebView url={item.landingPageUrl} />} />
               })
             }
-            {/*<Route path="/applications/catalog" element={<WebView url={Config.ads.url} />} />*/}
+            <Route path="/" element={<Navigate to="/home" replace={true} />} />
             <Route path="/health-dashboard" element={<HealthDashboard />} />
-            <Route path="/" element={<Home />} />
+            <Route path="/home" element={<Home />} />
             <Route path="*" element={<NotFound />} />
           </Routes>
           </div>