Updating react router usage to allow for testing.

This commit is contained in:
Roland 2023-01-04 19:45:42 -07:00
parent 373d460ba6
commit df0e04bd83
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
4 changed files with 49 additions and 35 deletions

View file

@ -1,7 +1,7 @@
import React, {useContext} from 'react';
import './App.css';
import {NavBar} from "./components/Nav";
import {Link, Route, Routes} from "react-router-dom";
import {createBrowserRouter, createRoutesFromElements, Link, Outlet, Route, RouterProvider} from "react-router-dom";
import {VideosRoute, VideoWrapper} from "./components/Videos";
import Admin from "./components/admin/Admin";
import {Container} from "semantic-ui-react";
@ -15,15 +15,16 @@ import {FilesRoute} from "./components/Files";
import {useStatusInterval} from "./hooks/customHooks";
import {MapRoute} from "./components/Map";
import {StatusContext, ThemeContext} from "./contexts/contexts";
import {ThemeWrapper} from "./components/Theme";
import {Header, ThemeWrapper} from "./components/Theme";
import {Dashboard} from "./Dashboard";
import {Donate} from "./components/Donate";
import {useEventsInterval} from "./Events";
function PageNotFound() {
const {t} = useContext(ThemeContext);
return <Container fluid>
<h1 className="display-4">Page Not Found!</h1>
<p>The page you requested cannot be found</p>
<Header as='h1'>Page Not Found!</Header>
<p {...t}>The page you requested cannot be found</p>
</Container>
}
@ -46,33 +47,44 @@ function Footer() {
</Container>
}
function Root() {
return <>
<header>
<NavBar/>
</header>
<Outlet/>
<Footer/>
<SemanticToastContainer position="top-right"/>
</>
}
const router = createBrowserRouter(createRoutesFromElements(
<Route
path='/'
element={<Root/>}
errorElement={<PageNotFound/>}
>
<Route index element={<Dashboard/>}/>
<Route path='donate' element={<Donate/>}/>
<Route path='videos/video/:videoId' exact element={<VideoWrapper/>}/>
<Route path='videos/channel/:channelId/video/:videoId' exact element={<VideoWrapper/>}/>
<Route path="videos/*" element={<VideosRoute/>}/>
<Route path="admin/*" element={<Admin/>}/>
<Route path="apps/*" element={<AppsRoute/>}/>
<Route path="inventory/*" element={<InventoryRoute/>}/>
<Route path='archive/*' element={<ArchiveRoute/>}/>
<Route path='map/*' element={<MapRoute/>}/>
<Route path='files/*' element={<FilesRoute/>}/>
</Route>
));
export default function App() {
const status = useStatusInterval();
useEventsInterval();
return (<ThemeWrapper>
return <ThemeWrapper>
<StatusContext.Provider value={status}>
<header>
<NavBar/>
</header>
<>
<Routes>
<Route path='/videos/video/:videoId' exact element={<VideoWrapper/>}/>
<Route path='/videos/channel/:channelId/video/:videoId' exact element={<VideoWrapper/>}/>
<Route path="/" exact element={<Dashboard/>}/>
<Route path="/videos/*" element={<VideosRoute/>}/>
<Route path="/admin/*" element={<Admin/>}/>
<Route path="/apps/*" element={<AppsRoute/>}/>
<Route path="/inventory/*" element={<InventoryRoute/>}/>
<Route path='/archive/*' element={<ArchiveRoute/>}/>
<Route path='/map/*' element={<MapRoute/>}/>
<Route path='/files/*' element={<FilesRoute/>}/>
<Route path='/donate' element={<Donate/>}/>
<Route element={<PageNotFound/>}/>
</Routes>
</>
<SemanticToastContainer position="top-right"/>
<Footer/>
<RouterProvider router={router}/>
</StatusContext.Provider>
</ThemeWrapper>);
</ThemeWrapper>;
}

View file

@ -2,6 +2,14 @@ import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
Object.defineProperty(window, 'matchMedia', {
writable: true, value: jest.fn().mockImplementation(query => ({
matches: false, media: query, onchange: null, addListener: jest.fn(), // Deprecated
removeListener: jest.fn(), // Deprecated
addEventListener: jest.fn(), removeEventListener: jest.fn(), dispatchEvent: jest.fn(),
})),
});
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App/>, div);

View file

@ -407,7 +407,7 @@ export function FileTable({files, selectOn, onSelect, footer, selectedKeys}) {
rows={rows}
/>;
} else {
return <Segment><p>No results!</p></Segment>
return <Segment>No results!</Segment>
}
}

View file

@ -3,14 +3,8 @@ import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';
import {BrowserRouter} from "react-router-dom";
ReactDOM.render(
<BrowserRouter>
<App/>
</BrowserRouter>,
document.getElementById('root')
);
ReactDOM.render(<App/>, document.getElementById('root'));
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.