diff --git a/static/client/App.tsx b/static/client/App.tsx index 1e375842..8089af03 100644 --- a/static/client/App.tsx +++ b/static/client/App.tsx @@ -1,9 +1,14 @@ import { QueryClient, QueryClientProvider } from "react-query"; import "./App.scss"; +import config from "./config"; import Main from "./pages/Main"; -const queryClient = new QueryClient(); +const queryClient = new QueryClient({ + defaultOptions: { + queries: config.api.FETCH_OPTIONS, + }, +}); const App: React.FC = () => { return ( diff --git a/static/client/components/Navigation/Navigation.tsx b/static/client/components/Navigation/Navigation.tsx index 65d307fe..139de460 100644 --- a/static/client/components/Navigation/Navigation.tsx +++ b/static/client/components/Navigation/Navigation.tsx @@ -9,14 +9,17 @@ import NavigationItems from "./NavigationItems"; import NavigationCollapseToggle from "@/components/Navigation/NavigationCollapseToggle"; import SiteSelector from "@/components/SiteSelector"; +import { useStore } from "@/store"; const Navigation = (): JSX.Element => { const navigate = useNavigate(); const [isCollapsed, setIsCollapsed] = useState(true); + const [user, setUser] = useStore((state) => [state.user, state.setUser]); const logout = useCallback(() => { + setUser(null); window.open("/logout", "_self"); - }, []); + }, [setUser]); const handleNewPageClick = useCallback(() => { navigate("/app/new-webpage"); @@ -55,6 +58,13 @@ const Navigation = (): JSX.Element => {
+
+ {user?.name} +
+
+ {user?.email} +
+