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

more bug fixes #144

Merged
merged 4 commits into from
Jan 29, 2025
Merged

more bug fixes #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40bd1c2
library sidepane + other feedback
okk0 Jan 29, 2025
fd62f2a
fixed tender library popup
okk0 Jan 29, 2025
ccc525a
fixed outline table sidepane opening and font sizes
okk0 Jan 29, 2025
9ac04e4
dropdown options styling changes
okk0 Jan 29, 2025
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
11 changes: 0 additions & 11 deletions src/buttons/BidStatusMenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@
border: none;
}

.styled-menu-item {
font-size: 1rem;
padding: 0.571rem 1.143rem;
font-weight: 600 !important;
border: none;
}

.styled-menu-item:hover {
background-color: #f5f5f5;
}

.bid-status-menu {
font-weight: 700;
font-size: 1.143rem;
Expand Down
117 changes: 70 additions & 47 deletions src/buttons/BidStatusMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
import { Menu, MenuItem, Button } from "@mui/material";
import { useState } from "react";
import { Search, ClipboardList, FileWarning, FileCheck, FileSignature } from "lucide-react";
import {
Search,
ClipboardList,
FileWarning,
FileCheck,
FileSignature
} from "lucide-react";

type BidStatus = "Planning" | "Research" | "First Draft" | "Reviewing" | "Complete";
type BidStatus =
| "Planning"
| "Research"
| "First Draft"
| "Reviewing"
| "Complete";

const BidStatusMenu = ({
value,
Expand All @@ -22,8 +33,18 @@ const BidStatusMenu = ({
};

const normalizeStatus = (status: any): BidStatus => {
const validStatuses: BidStatus[] = ["Planning", "Research", "First Draft", "Reviewing", "Complete"];
return status in statusMapping ? statusMapping[status] : (validStatuses.includes(status) ? status : "Planning");
const validStatuses: BidStatus[] = [
"Planning",
"Research",
"First Draft",
"Reviewing",
"Complete"
];
return status in statusMapping
? statusMapping[status]
: validStatuses.includes(status)
? status
: "Planning";
};

const currentStatus = normalizeStatus(value);
Expand All @@ -44,36 +65,37 @@ const BidStatusMenu = ({
const getStatusStyles = (status: BidStatus): { sx: any } => {
const baseStyles = {
fontWeight: 700,
fontSize: '1.143rem',
whiteSpace: 'nowrap',
textTransform: 'none',
border: 'none',
'&:hover': {
fontSize: "1.143rem",
fontFamily: '"Manrope", sans-serif',
whiteSpace: "nowrap",
textTransform: "none",
border: "none",
"&:hover": {
opacity: 0.9,
border: 'none'
border: "none"
}
};

const colors = {
Planning: {
backgroundColor: '#FFE4DC',
color: '#D14D1F',
backgroundColor: "#FFE4DC",
color: "#D14D1F"
},
Research: {
backgroundColor: '#E1F3FB',
color: '#2B87AF',
backgroundColor: "#E1F3FB",
color: "#2B87AF"
},
"First Draft": {
backgroundColor: '#E6FFE6',
color: '#2E8B2E',
backgroundColor: "#E6FFE6",
color: "#2E8B2E"
},
Reviewing: {
backgroundColor: '#F8E6F8',
color: '#8B488B',
backgroundColor: "#F8E6F8",
color: "#8B488B"
},
Complete: {
backgroundColor: '#E0F5E9',
color: '#2A7F4F',
backgroundColor: "#E0F5E9",
color: "#2A7F4F"
}
};

Expand All @@ -82,9 +104,9 @@ const BidStatusMenu = ({
...baseStyles,
backgroundColor: colors[status].backgroundColor,
color: colors[status].color,
'&:hover': {
...baseStyles['&:hover'],
backgroundColor: colors[status].backgroundColor,
"&:hover": {
...baseStyles["&:hover"],
backgroundColor: colors[status].backgroundColor
}
}
};
Expand Down Expand Up @@ -117,7 +139,7 @@ const BidStatusMenu = ({
{currentStatus}
<StatusIcon className="ml-2" size={16} />
</Button>

<Menu
id="bid-status-menu"
open={Boolean(anchorEl)}
Expand All @@ -127,34 +149,35 @@ const BidStatusMenu = ({
PaperProps={{
elevation: 1,
sx: {
width: '120px',
boxShadow: '0 2px 5px rgba(0,0,0,0.1)'
width: "120px",
boxShadow: "0 2px 5px rgba(0,0,0,0.1)"
}
}}
>
{["Planning", "Research", "First Draft", "Reviewing", "Complete"].map((status) => {
const Icon = getStatusIcon(status as BidStatus);
return (
<MenuItem
key={status}
onClick={() => handleSelect(status as BidStatus)}
sx={{
fontSize: '1rem',
padding: '0.571rem 1.143rem',
fontWeight: 600,
'&:hover': {
backgroundColor: '#f5f5f5'
}
}}
>
{status}

</MenuItem>
);
})}
{["Planning", "Research", "First Draft", "Reviewing", "Complete"].map(
(status) => {
const Icon = getStatusIcon(status as BidStatus);
return (
<MenuItem
key={status}
onClick={() => handleSelect(status as BidStatus)}
sx={{
fontSize: "1.1rem",
padding: "0.571rem 1.143rem",
fontWeight: 600,
"&:hover": {
backgroundColor: "#f5f5f5"
}
}}
>
{status}
</MenuItem>
);
}
)}
</Menu>
</div>
);
};

export default BidStatusMenu;
export default BidStatusMenu;
Loading