Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features/update react router #44

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Features/update react router #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336147b
Updated application to use BrowserRouter instead of HashRouter to imp…
anilnatha Dec 17, 2024
fea8c6b
Updated homepage so that it exists at /home and anytime the path at "…
anilnatha Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion etc/apache2/sites-available/unity-ui.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions src/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
Navigate,
Route,
Routes,
} from "react-router-dom"
Expand Down Expand Up @@ -28,7 +29,6 @@ function Root() {

useEffect(() => {


if (healthState.status === "idle") {
// Fetch the health data
dispatch(getHealthData());
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
)
Loading