diff --git a/src/navigation/NavigationContainer.tsx b/src/navigation/NavigationContainer.tsx index c515706..c999277 100644 --- a/src/navigation/NavigationContainer.tsx +++ b/src/navigation/NavigationContainer.tsx @@ -4,7 +4,8 @@ import Header from "../app/Header"; import React, { PropsWithChildren, useState } from "react"; // import BottomNavigator from "./BottomNavigator"; // import Routes from "./Routes"; -// import SideNavigator from "./SideNavigator"; +import SideNavigator from "./SideNavigator"; +import Router from "./Router"; // import { Team } from "models"; // import NotificationBanner from "common/NotificationBanner"; @@ -39,8 +40,8 @@ export default function NavigationContainer(props: Props) { // teams={teams} // setTeams={setTeams} /> - {/* */} - {/* */} + + {/* {isMobile && } */} {children} diff --git a/src/navigation/Router.tsx b/src/navigation/Router.tsx index 1fc0a41..6c1b916 100644 --- a/src/navigation/Router.tsx +++ b/src/navigation/Router.tsx @@ -2,11 +2,13 @@ import { Suspense } from "react"; import LoadingScreen from "../app/LoadingScreen"; import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom"; import { Typography } from "@mui/material"; +import { useAuth0 } from "@auth0/auth0-react"; export default function Router() { + const { isAuthenticated, loginWithRedirect, isLoading } = useAuth0() const hello = () => { return ( @@ -16,6 +18,21 @@ export default function Router() { ) } + // useEffect(() => { + // setAuthorized(isAuthenticated || offline); + // if (isAuthenticated && !user.empty() && !user.status.finishedIntro) { + // history.push("/welcome"); + // } + // }, [history, isAuthenticated, offline, user]); + + if (isLoading) return null; + if (!isAuthenticated) { + loginWithRedirect() + return ( + null + ) + } + return ( }>