redirecting to login if not authenticated in router

This commit is contained in:
Carter 2024-11-13 10:37:24 -06:00
parent e639e2cdf9
commit e17896aa35
2 changed files with 21 additions and 3 deletions

View file

@ -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}
/>
{/* <SideNavigator open={sideNavigatorOpen} onOpen={openSideNavigator} onClose={closeSideMenu} /> */}
{/* <Routes /> */}
<SideNavigator open={sideNavigatorOpen} onOpen={openSideNavigator} onClose={closeSideMenu} />
<Router />
{/* {isMobile && <BottomNavigator openSide={openSideNavigator} sideIsOpen={sideNavigatorOpen} />} */}
{children}
</React.Fragment>

View file

@ -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 (
<Suspense fallback={<LoadingScreen />}>
<BrowserRouter>