minor menu refactor

Dereje1 · Apr 4, 2023 · 5874c89 · 5874c89
1 parent 8e77656
commit 5874c89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/client/src/components/menu/menu.tsx b/client/src/components/menu/menu.tsx
@@ -89,17 +89,20 @@ export class Menu extends React.Component<MenuProps, MenuState> {
     const {
       displaySignIn,
     } = this.state;
-    if (authenticated) {
-      return (
-        <CollapsibleMenu
-          pathname={pathname}
-          menuClicked={this.handleMenuClick}
-        />
-      );
-    }
+
     return (
       <>
-        <Login showSignIn={() => this.setState({ displaySignIn: true })} />
+        <Brand />
+        {
+          authenticated ? (
+            <CollapsibleMenu
+              pathname={pathname}
+              menuClicked={this.handleMenuClick}
+            />
+          )
+            : <Login showSignIn={() => this.setState({ displaySignIn: true })} />
+        }
+
         {displaySignIn && (
           <SignIn
             removeSignin={() => this.setState({ displaySignIn: false })}
@@ -127,14 +130,13 @@ export class Menu extends React.Component<MenuProps, MenuState> {
     document.body.classList.remove('cover');
     return (
       <div className="menu">
-        {!showSearch && <Brand /> }
         <Search
           isShowing={showSearch}
           openSearch={() => this.setState({ showSearch: true })}
           closeSearch={() => this.setState({ showSearch: false })}
           pathname={pathname}
         />
-        { !showSearch && this.renderMenu(authenticated)}
+        {!showSearch && this.renderMenu(authenticated)}
       </div>
     );
   }

diff --git a/tests/client/src/components/menu/__snapshots__/menu.test.tsx.snap b/tests/client/src/components/menu/__snapshots__/menu.test.tsx.snap
@@ -4,13 +4,13 @@ exports[`The Menu component will render for an authenticated user 1`] = `
 <div
   className="menu"
 >
-  <Brand />
   <Search
     closeSearch={[Function]}
     isShowing={false}
     openSearch={[Function]}
     pathname="/"
   />
+  <Brand />
   <CollapsibleMenu
     menuClicked={[Function]}
     pathname="/"
@@ -22,13 +22,13 @@ exports[`The Menu component will render for users authenticated as guest 1`] = `
 <div
   className="menu"
 >
-  <Brand />
   <Search
     closeSearch={[Function]}
     isShowing={false}
     openSearch={[Function]}
     pathname="/"
   />
+  <Brand />
   <Login
     showSignIn={[Function]}
   />