diff --git a/components/Header.tsx b/components/Header.tsx index 39405d04..bf728fc4 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -1,7 +1,7 @@ import { merge } from 'lodash'; import Head from 'next/head'; import Link from 'next/link'; -import { useRouter } from 'next/router'; +import { NextRouter, useRouter } from 'next/router'; import React, { ReactElement, useCallback, @@ -58,14 +58,12 @@ type HeaderProps = { }; type DropdownMenuWrapperProps = { - splashPage?: boolean; userInfo: UserInfo | null; onSignOut: () => void; onSignIn: (token: string) => void; }; export const DropdownMenuWrapper = ({ - splashPage = false, userInfo, onSignOut, onSignIn, @@ -73,6 +71,7 @@ export const DropdownMenuWrapper = ({ const [showModal, setShowModal] = useState(false); const [showMenuDropdown, setShowMenuDropdown] = useState(false); const dropdownRef = useRef(null); + const router = useRouter(); useEffect(() => { const handleCloseDropdown = (event: Event): void => { @@ -96,23 +95,29 @@ export const DropdownMenuWrapper = ({ setShowMenuDropdown(!showMenuDropdown); }; - // Commented out until subscription page is finalized - // const subscriptionPage = (): void => { - // router.push('/subscriptions'); - // }; - const DropDownMenu = (): ReactElement => { return (
-
- {splashPage && <>Logged In} - +
+ <> + {userInfo && !macros.isMobile && ( + + )} + {/* Still need to create FAQ page */} + {/* */} + +
+ +
{showMenuDropdown && ( diff --git a/components/ResultsPage/SemesterDropdown.tsx b/components/ResultsPage/SemesterDropdown.tsx index 9f3d7706..99d19c9e 100644 --- a/components/ResultsPage/SemesterDropdown.tsx +++ b/components/ResultsPage/SemesterDropdown.tsx @@ -46,8 +46,8 @@ function SemesterDropdown({ className={'DropdownFilter__input'} tabIndex={0} type="text" - value={currentText} - /> + defaultValue={currentText} + >