Revert "master to prod"

components/Header.tsx

@@ -37,7 +37,7 @@ import NotifSignUpButton from './ResultsPage/Results/NotifSignUpButton';
 import { getRoundedTerm } from './terms';
 
 const isWindow = typeof window !== 'undefined';
-export const termAndCampusToURL = (
+const termAndCampusToURL = (
   t: string,
   newCampus: string,
   query: string
@@ -58,20 +58,21 @@ type HeaderProps = {
 };
 
 type DropdownMenuWrapperProps = {
+  splashPage?: boolean;
   userInfo: UserInfo | null;
   onSignOut: () => void;
   onSignIn: (token: string) => void;
 };
 
 export const DropdownMenuWrapper = ({
+  splashPage = false,
   userInfo,
   onSignOut,
   onSignIn,
 }: DropdownMenuWrapperProps): ReactElement => {
   const [showModal, setShowModal] = useState(false);
   const [showMenuDropdown, setShowMenuDropdown] = useState(false);
   const dropdownRef = useRef(null);
-  const router = useRouter();
 
   useEffect(() => {
     const handleCloseDropdown = (event: Event): void => {
@@ -95,29 +96,23 @@ export const DropdownMenuWrapper = ({
     setShowMenuDropdown(!showMenuDropdown);
   };
 
+  // Commented out until subscription page is finalized
+  // const subscriptionPage = (): void => {
+  //   router.push('/subscriptions');
+  // };
+
   const DropDownMenu = (): ReactElement => {
     return (
       <div className="user-menu">
-        <div className={'user-menu__icon-wrapper'}>
-          <>
-            {userInfo && !macros.isMobile && (
-              <button
-                onClick={() => router.push('/subscriptions')}
-                className="user-menu__button"
-              >
-                Notifications
-              </button>
-            )}
-            {/* Still need to create FAQ page */}
-            {/* <button>FAQ</button> */}
-          </>
-          <div
-            className="user-menu__icon"
-            ref={dropdownRef}
-            onClick={toggleMenuDropdown}
-          >
-            <IconUser />
-          </div>
+        <div
+          ref={dropdownRef}
+          className={
+            splashPage ? 'user-menu__splash-page' : 'user-menu__icon-wrapper'
+          }
+          onClick={toggleMenuDropdown}
+        >
+          {splashPage && <>Logged In</>}
+          <IconUser className="user-menu__icon" />
         </div>
 
         {showMenuDropdown && (
@@ -262,7 +257,7 @@ export default function Header({
             />
           </div>
         )}
-        {macros.isMobile && searchData && (
+        {searchData && (
           <div className="Breadcrumb_Container">
             <div className="Breadcrumb_Container__dropDownContainer">
               <SearchDropdown

components/common/AlertBanner.tsx

@@ -1,17 +1,14 @@
-import React, { ReactElement, useState } from 'react';
+import React, { useState } from 'react';
 import macros from '../macros';
 import IconClose from '../icons/IconClose';
-import Colors from '../../styles/_exports.module.scss';
-import GraduateLogo from '../icons/GraduateLogo';
+import Colors from '../styles/_exports.module.scss';
 
 type AlertLevel = 'error' | 'warning' | 'info';
 
 export type AlertBannerData = {
   text: string;
   alertLevel: AlertLevel;
   link?: string;
-  linkText?: string;
-  logo?: () => ReactElement;
 };
 
 type AlertBannerProps = {
@@ -31,20 +28,10 @@ export default function AlertBanner({ alertBannerData }: AlertBannerProps) {
       >
         <div className={`alertBanner ${alertBannerData.alertLevel}Banner`}>
           <div className="alertBanner__text">
-            {alertBannerData.logo && (
-              <span className="alertBanner__logo">
-                <alertBannerData.logo />
-              </span>
-            )}
             <span>
               {alertBannerData.text}
               {alertBannerData.link && (
-                <a href={alertBannerData.link} target="_blank" rel="noreferrer">
-                  {' '}
-                  {alertBannerData.linkText
-                    ? alertBannerData.linkText
-                    : 'Learn More'}
-                </a>
+                <a href={alertBannerData.link}> Learn More.</a>
               )}
             </span>
           </div>