Skip to content

refactor: Fix front-end lint issues #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 23, 2022
Merged

refactor: Fix front-end lint issues #347

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56e7086
Rename jest-runner config so it is properly picked up
bryphe-coder Feb 21, 2022
ff68093
Pick up automatic fixes
bryphe-coder Feb 21, 2022
e8baef3
Fix unnecessary checks in UserDropdown
bryphe-coder Feb 21, 2022
b37f485
Fix missed useEffect dependencies in Redirect
bryphe-coder Feb 21, 2022
1a490df
Fix remaining lint issues
bryphe-coder Feb 21, 2022
3b02d21
Fix infinite loop in useEffect
bryphe-coder Feb 23, 2022
df532d8
Merge branch 'main' into bryphe/refactor/fix-lint-issues
bryphe-coder Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix unnecessary checks in UserDropdown
  • Loading branch information
@bryphe-coder
bryphe-coder committed Feb 21, 2022
commit e8baef367a140b83e76d9eeb4f9503822ad6d731
30 changes: 13 additions & 17 deletions site/components/Navbar/UserDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ export const UserDropdown: React.FC<UserDropdownProps> = ({ user, onSignOut }: U
<div>
<MenuItem onClick={handleDropdownClick}>
<div className={styles.inner}>
{user && (
<Badge overlap="circle">
<UserAvatar user={user} />
</Badge>
)}
<Badge overlap="circle">
<UserAvatar user={user} />
</Badge>
{anchorEl ? (
<KeyboardArrowUp className={`${styles.arrowIcon} ${styles.arrowIconUp}`} />
) : (
Expand All @@ -65,20 +63,18 @@ export const UserDropdown: React.FC<UserDropdownProps> = ({ user, onSignOut }: U
variant="user-dropdown"
onClose={onPopoverClose}
>
{user && (
<div className={styles.userInfo}>
<UserProfileCard user={user} />
<div className={styles.userInfo}>
<UserProfileCard user={user} />

<Divider className={styles.divider} />
<Divider className={styles.divider} />

<MenuItem className={styles.menuItem} onClick={onSignOut}>
<ListItemIcon className={styles.icon}>
<LogoutIcon />
</ListItemIcon>
<ListItemText primary="Sign Out" />
</MenuItem>
</div>
)}
<MenuItem className={styles.menuItem} onClick={onSignOut}>
<ListItemIcon className={styles.icon}>
<LogoutIcon />
</ListItemIcon>
<ListItemText primary="Sign Out" />
</MenuItem>
</div>
</BorderedMenu>
</>
)
Expand Down