chore: fix appBar

.gitignore

@@ -12,6 +12,8 @@ dist
 dist-ssr
 *.local
 
+.env
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json

src/components/AppBar/AppBar.tsx

@@ -64,18 +64,13 @@ export const AppBar = () => {
 
   return (
     <AppBarMui position='fixed' className={styles.AppBar}>
-      <Toolbar>
+      <Toolbar className={styles.toolbar}>
-        <Box
+        <Box className={styles.logoWrapper}>
-          className={
-            isAuthenticated ? styles.AppBarLogoWrapper : styles.AppBarUnAuth
-          }
-        >
-          <div className={styles.logoWrapper}>
           <img src={nostrichLogo} alt='Logo' onClick={() => navigate('/')} />
-          </div>
+        </Box>
 
+        <Box className={styles.rightSideBox}>
           {!isAuthenticated && (
-            <Box>
             <Button
               onClick={() => {
                 navigate(appPublicRoutes.login)
@@ -84,17 +79,10 @@ export const AppBar = () => {
             >
               Sign in
             </Button>
-            </Box>
           )}
-        </Box>
 
-        {authState?.loggedIn && (
+          {isAuthenticated && (
-          <div
+            <>
-            style={{
-              display: 'flex',
-              justifyContent: 'flex-end'
-            }}
-          >
               <Username
                 username={username}
                 avatarContent={userAvatar}
@@ -147,8 +135,9 @@ export const AppBar = () => {
                   Logout
                 </MenuItem>
               </Menu>
-          </div>
+            </>
           )}
+        </Box>
       </Toolbar>
     </AppBarMui>
   )

src/components/AppBar/style.module.scss

@@ -3,54 +3,32 @@
 .AppBar {
   background-color: $background-color !important;
   z-index: 1400 !important;
+  height: 60px;
+  flex-direction: row !important;
+  align-items: center;
 
-  .AppBarIcon {
+  .toolbar {
-    background-color: $btn-background-color !important;
+    flex-grow: 1;
-    margin-right: 10px;
-  }
-
-  .logoWrapper {
     display: flex;
     align-items: center;
-    height: 100%;
-    padding: 13px 0 13px 0;
-    box-sizing: border-box;
   }
 
-  .AppBarLogoWrapper {
-    height: 60px;
-    width: 100px;
-    cursor: pointer;
-    justify-content: center;
-    align-items: center;
-
   .logoWrapper {
-      margin-left: 20px;
+    height: 50px;
+    width: 100px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
 
     img {
       max-height: 100%;
       max-width: 150px;
     }
   }
-  }
 
-  .AppBarUnAuth {
+  .rightSideBox {
-    height: 60px;
+    flex-grow: 1;
-    cursor: pointer;
-    justify-content: space-between;
-    align-items: center;
     display: flex;
-    width: 100%;
+    justify-content: flex-end;
-
-    .logoWrapper {
-      img {
-        max-height: 100%;
-        max-width: 120px;
-      }
-    }
-
-    .loginBtn {
-      margin-right: 16px;
-    }
   }
 }