Skip to content
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

Jump to bottom

fix: refactored Nav bar #509

Merged
merged 2 commits into from
Oct 21, 2023
Merged

fix: refactored Nav bar #509

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8f2b01
Refactored Nav bar
0xNunana Oct 20, 2023
48e158e
Merge branch 'main' into Nunana
Dun-sin Oct 21, 2023
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
35 changes: 35 additions & 0 deletions client/src/components/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ const NavBar = ({ className }) => {
'h-[70px]',
])}
>
<div className='hidden md:flex'>
<img src='favicon.ico'/>
</div>
<div className="justify-between md:justify-center flex items-center md:flex-col flex-row h-full w-full gap-2 flex-nowrap overflow-auto md:h-full">
<Whisper
placement="auto"
Expand Down Expand Up @@ -119,6 +122,9 @@ const NavBar = ({ className }) => {
<Icon icon="fluent:person-circle-20-regular" color="white" height="24" width="24" />
</NavLink>
</Whisper>

{/* show only on mobile screen */}
<div className='flex w-full md:hidden'>
<Whisper
placement="auto"
controlId="control-id-hover"
Expand All @@ -129,6 +135,35 @@ const NavBar = ({ className }) => {
<Icon icon="ic:outline-settings" color="white" height="24" width="24" />
</NavLink>
</Whisper>
</div>

<div className='flex w-full md:hidden'>
<Whisper
placement="auto"
controlId="control-id-hover"
trigger="hover"
speaker={<Tooltip>Logout</Tooltip>}
>
<button className={linkStyle} onClick={() => handleLogout()}>
<Icon icon="majesticons:logout-half-circle" color="white" height={24} width={24} />
</button>
</Whisper>
</div>



</div>
<div className='hidden md:block w-full'>
<Whisper
placement="auto"
controlId="control-id-hover"
trigger="hover"
speaker={<Tooltip>Settings</Tooltip>}
>
<NavLink to="/settings" className={getLinkStyle}>
<Icon icon="ic:outline-settings" color="white" height="24" width="24" />
</NavLink>
</Whisper>
<Whisper
placement="auto"
controlId="control-id-hover"
Expand Down
Loading