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

Brian/profile hover over #52

Merged
merged 7 commits into from
Mar 12, 2024
Merged

Brian/profile hover over #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
971ef47
added contactuspage
Feb 23, 2024
a1b3b15
base components
Mar 2, 2024
e48a47e
added basic parts
Mar 8, 2024
eca2b82
completed card
Mar 8, 2024
03d5c63
finish hover over component
Mar 9, 2024
4a37c29
Merge main to branch
ltan02 Mar 12, 2024
5c8c881
Fix build
ltan02 Mar 12, 2024
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
2 changes: 1 addition & 1 deletion frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions frontend/src/components/buttons/LogOutButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';

export default function LogOutButton({ onClick }) {
return (
<button
type="button"
className="bg-mv-white w-100% h-100% items-center justify-center"
onClick={onClick}
>
<div className="font-poppins text-base font-medium leading-6 text-center">
Log Out
</div>
</button>
);
}
89 changes: 89 additions & 0 deletions frontend/src/components/cards/ProfilePopUpCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import React from 'react';
import { useNavigate } from 'react-router';
import HistoryIcon from '@mui/icons-material/History';
import PersonIcon from '@mui/icons-material/Person';
import LogOutButton from '../buttons/LogOutButton';

export default function ProfilePopUpCard({ bidderID }) {
const navigate = useNavigate();

const handleLogOut = async () => {
try {
localStorage.removeItem('userInfo');
navigate('/');
} catch (err) {
// eslint-disable-next-line no-console
console.error(
err.response ? err.response.data.error : 'An unknown error occurred'
);
}
};
return (
<div className="flex w-[362px] h-[409px] rounded-2xl shadow-2xl m-5 overflow-hidden relative bg-mv-white">
<div className="w-full flex">
<div className="w-full px-9 py-7">
<div className="flex flex-col text-gray-700 text-base text-xxs">
<div className="flex flex-row justify-center">
<div>
<div className="flex flex-col items-center">
<div className="flex flex-col justify-center">
<span className="font-poppins text-xl font-semibold leading-10 text-center bg-gray-600">
Bidder ID: #123456
</span>
<span>{bidderID}</span>
</div>
</div>
</div>
</div>
<hr className="border-solid border border-black border-opacity-30 my-4" />
<div className="flex flex-row justify-between py-3">
<div>
<div className="flex flex-row items-center px-5">
<PersonIcon style={{ fontSize: '39px' }} className="mr-2" />
<div className="flex flex-col justify-between px-6">
<span className="font-poppins text-base font-medium leading-6 text-left">
User Profile
</span>
<a
href="/onboard"
className="font-poppins text-xs font-normal leading-5 text-left text-blue-600 underline hover:text-blue-800"
>
Click to see your user details, notification settings, and
watchlist
</a>
</div>
</div>
</div>
</div>
<div className="flex flex-row justify-between">
<div>
<div className="flex flex-row items-center px-5">
<HistoryIcon style={{ fontSize: '39px' }} className="mr-2" />
<div className="flex flex-col justify-between px-6 py-4">
<span className="font-poppins text-base font-medium leading-6 text-left">
Bid History
</span>
<a
href="/onboard"
className="font-poppins text-xs font-normal leading-5 text-left text-blue-600 underline hover:text-blue-800"
>
Click to see your current and past bids
</a>
</div>
</div>
</div>
</div>
<hr className="border-solid border border-black border-opacity-30 my-4" />
<div className="flex flex-row justify-center my-4">
<div>
<div className="flex flex-col items-center">
<LogOutButton onClick={handleLogOut} />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
);
}
13 changes: 13 additions & 0 deletions frontend/src/components/navBars/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import PersonIcon from '@mui/icons-material/Person';
import PersonOutlinedIcon from '@mui/icons-material/PersonOutlined';
import logo from '../../assets/microvan_logo.svg';
import useAuth from '../../hooks/useAuth';
import ProfilePopUpCard from '../cards/ProfilePopUpCard';

export default function NavBar() {
const [notificationHover, setNotificationHover] = useState(false);
Expand Down Expand Up @@ -93,6 +94,18 @@ export default function NavBar() {
) : (
<PersonOutlinedIcon className="w-[35px] h-[35px] text-mv-black hover:cursor-pointer" />
)}
{personHover && (
<div
style={{
position: 'fixed',
bottom: '230',
right: '10px',
zIndex: 100,
}}
>
<ProfilePopUpCard />
</div>
)}
</div>
</div>
</div>
Expand Down
Loading