diff --git a/packages/fakeyou.com/public/fakeyou/Storyteller-Logo.png b/packages/fakeyou.com/public/fakeyou/Storyteller-Logo.png new file mode 100644 index 0000000000..02e5be9716 Binary files /dev/null and b/packages/fakeyou.com/public/fakeyou/Storyteller-Logo.png differ diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index fc37d2824c..c7185041ab 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -53,6 +53,13 @@ export default function SideNav({ const isDevelopmentEnv = fakeYouFrontendEnv.isDevelopment(); const wrapper = document.getElementById("wrapper"); const isMenuOpen = wrapper?.classList.contains("toggled"); + const isLoggedIn = sessionWrapper.isLoggedIn(); + const isOnLandingPage = window.location.pathname === "/"; + const isOnLoginOrSignUpPage = + window.location.pathname === "/login" || + window.location.pathname === "/login/" || + window.location.pathname === "/signup" || + window.location.pathname === "/signup/"; let history = useHistory(); const handleNavLinkClick = () => { @@ -102,17 +109,25 @@ export default function SideNav({ }; }, []); - const shouldShowSidebar = windowWidth >= 992; + const shouldNotShowSidebar = + !isLoggedIn && (isOnLandingPage || isOnLoginOrSignUpPage); + const shouldShowSidebar = windowWidth >= 992 && !shouldNotShowSidebar; + const sidebarClassName = `sidebar ${ + shouldShowSidebar ? "visible" : "" + }`.trim(); useEffect(() => { const contentWrapper = document.getElementById("page-content-wrapper"); - if (windowWidth >= 992) { + if ( + (shouldShowSidebar && isLoggedIn) || + (shouldShowSidebar && !isOnLandingPage) + ) { contentWrapper?.classList.remove("no-padding"); } else { contentWrapper?.classList.add("no-padding"); } - }, [windowWidth]); + }, [isLoggedIn, isOnLandingPage, shouldShowSidebar]); const [queueStats, setQueueStats] = useState({ success: true, @@ -256,10 +271,7 @@ export default function SideNav({ return ( <> -