Updates, bug fix, prompt refactor

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/index.js

@@ -5,7 +5,7 @@ import Dinero from "dinero.js";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
-import { BrowserRouter as Router } from "react-router-dom";
+import {createBrowserRouter, createRoutesFromElements, Route, RouterProvider} from "react-router-dom";
 import { PersistGate } from "redux-persist/integration/react";
 import AppContainer from "./App/App.container";
 import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
@@ -47,22 +47,42 @@ if (process.env.NODE_ENV !== "development") {
   });
 }
 
-const root = ReactDOM.createRoot(document.getElementById("root"));
-root.render(
-    <React.StrictMode>
-      <Provider store={store}>
-        <Router>
-          <PersistGate
-              loading={<LoadingSpinner message="Restoring your settings..." />}
-              persistor={persistor}
-          >
-            <AppContainer />
-          </PersistGate>
-        </Router>
-      </Provider>
-    </React.StrictMode>
+// const root = ReactDOM.createRoot(document.getElementById("root"));
+
+const router = createBrowserRouter(
+    createRoutesFromElements(
+        <Route path="*" element={<AppContainer />}>
+        </Route>
+    )
 );
 
+export default function App() {
+    return (
+        <Provider store={store}>
+            <RouterProvider router={router} />
+        </Provider>
+    );
+}
+ReactDOM.createRoot(document.getElementById('root')).render(
+    <PersistGate loading={<LoadingSpinner message="Restoring your settings..." />} persistor={persistor}>
+        <App />
+    </PersistGate>);
+
+// root.render(
+//     <React.StrictMode>
+//       <Provider store={store}>
+//         <BrowserRouter>
+//           <PersistGate
+//               loading={<LoadingSpinner message="Restoring your settings..." />}
+//               persistor={persistor}
+//           >
+//             <AppContainer />
+//           </PersistGate>
+//         </BrowserRouter>
+//       </Provider>
+//     </React.StrictMode>
+// );
+
 // const onServiceWorkerUpdate = (registration) => {
 //   console.log("onServiceWorkerUpdate", registration);