From b5c97bc8957f79b76a40b70aa2ace333775b151b Mon Sep 17 00:00:00 2001
From: shams mosowi <shams.mosowi@gmail.com>
Date: Tue, 10 Sep 2019 21:41:32 +1000
Subject: [PATCH] clean up

---
 src/App.tsx                               |  7 ++++---
 src/components/Navigation.tsx             |  1 -
 src/hooks/useAuth.ts                      |  4 ++--
 src/hooks/useSettings.ts                  |  1 -
 src/util/CustomBrowserRouter.tsx          | 18 ++++++++++++++++++
 src/{components => util}/PrivateRoute.tsx |  1 -
 src/views/TableView.tsx                   |  1 -
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/util/CustomBrowserRouter.tsx
 rename src/{components => util}/PrivateRoute.tsx (95%)

diff --git a/src/App.tsx b/src/App.tsx
index 2ba50294..e69adeae 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,8 +7,9 @@ import TableView from "./views/TableView";
 
 import { BrowserRouter as Router, Route } from "react-router-dom";
 import { AuthProvider } from "./AuthProvider";
+import CustomBrowserRouter from "./util/CustomBrowserRouter";
 
-import PrivateRoute from "./components/PrivateRoute";
+import PrivateRoute from "./util/PrivateRoute";
 const theme = createMuiTheme({
   spacing: 4,
   palette: {
@@ -22,12 +23,12 @@ const App: React.FC = () => {
   return (
     <ThemeProvider theme={theme}>
       <AuthProvider>
-        <Router>
+        <CustomBrowserRouter>
           <div>
             <Route exact path="/auth" component={AuthView} />
             <PrivateRoute path="/table/" component={TableView} />
           </div>
-        </Router>
+        </CustomBrowserRouter>
       </AuthProvider>
     </ThemeProvider>
   );
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index a1304a20..8fc990f9 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -55,7 +55,6 @@ export const Navigation = (props: any) => {
   const router = useRouter();
   const classes = useStyles();
   const [settings, createTable] = useSettings();
-  console.log(props);
   return (
     <React.Fragment>
       <CssBaseline />
diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts
index a93e0c8d..862d6223 100644
--- a/src/hooks/useAuth.ts
+++ b/src/hooks/useAuth.ts
@@ -7,8 +7,8 @@ const useAuth = () => {
   );
 
   useEffect(() => {
-    auth.onAuthStateChanged(token => {
-      setAuthUser(token);
+    auth.onAuthStateChanged(user => {
+      setAuthUser(user);
     });
   }, []);
 
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index eda5647d..cc33b0a1 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -14,7 +14,6 @@ const useSettings = () => {
 
   const createTable = (name: string, collection: string) => {
     const { tables } = settingsState;
-    console.log(tables);
     documentDispatch({
       action: DocActions.update,
       data: { tables: [...tables, { name, collection }] }
diff --git a/src/util/CustomBrowserRouter.tsx b/src/util/CustomBrowserRouter.tsx
new file mode 100644
index 00000000..1c57f920
--- /dev/null
+++ b/src/util/CustomBrowserRouter.tsx
@@ -0,0 +1,18 @@
+import React from "react";
+import { BrowserRouter, Route } from "react-router-dom";
+
+export const RouterContext = React.createContext({});
+
+const CustomBrowserRouter = ({ children }: any) => (
+  <BrowserRouter>
+    <Route>
+      {routeProps => (
+        <RouterContext.Provider value={routeProps}>
+          {children}
+        </RouterContext.Provider>
+      )}
+    </Route>
+  </BrowserRouter>
+);
+
+export default CustomBrowserRouter;
diff --git a/src/components/PrivateRoute.tsx b/src/util/PrivateRoute.tsx
similarity index 95%
rename from src/components/PrivateRoute.tsx
rename to src/util/PrivateRoute.tsx
index 8284ec75..04f3eac2 100644
--- a/src/components/PrivateRoute.tsx
+++ b/src/util/PrivateRoute.tsx
@@ -4,7 +4,6 @@ import AuthContext from "../contexts/authContext";
 
 const PrivateRoute = ({ component: RouteComponent, ...rest }: any) => {
   const { currentUser } = useContext(AuthContext);
-  console.log(currentUser);
   return (
     <Route
       {...rest}
diff --git a/src/views/TableView.tsx b/src/views/TableView.tsx
index 267f11be..c476e560 100644
--- a/src/views/TableView.tsx
+++ b/src/views/TableView.tsx
@@ -13,7 +13,6 @@ export default function AuthView() {
   const tableCollection = router.location.pathname.split("/")[2];
   const [tableConfig, tableActions] = useTableConfig(tableCollection);
   const [table, tableDispatch] = useTable({ path: tableCollection });
-  console.log("tableConfig", tableConfig);
   const classes = useStyles();
   useEffect(() => {
     tableActions.setTable(tableCollection);