From df0e04bd83386f2880fe6bce7952410731eb8364 Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 4 Jan 2023 19:45:42 -0700 Subject: [PATCH] Updating react router usage to allow for testing. --- app/src/App.js | 66 ++++++++++++++++++++++--------------- app/src/App.test.js | 8 +++++ app/src/components/Files.js | 2 +- app/src/index.js | 8 +---- 4 files changed, 49 insertions(+), 35 deletions(-) diff --git a/app/src/App.js b/app/src/App.js index 2771cde3..9ad38d68 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -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 -

Page Not Found!

-

The page you requested cannot be found

+
Page Not Found!
+

The page you requested cannot be found

} @@ -46,33 +47,44 @@ function Footer() { } +function Root() { + return <> +
+ +
+ +