Merge pull request #56 from the-collab-lab/gl-design

Have fixed chip width, update calculateUrgency function
the-collab-lab · Apr 1, 2024 · 312fa1b · 312fa1b
2 parents 24bca8c + fe55ee1
commit 312fa1b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/api/firebase.js b/src/api/firebase.js
@@ -287,5 +287,9 @@ export const calculateUrgency = (daysUntilNextPurchase, dateLastPurchased) => {
 		return 'kind of soon';
 	} else if (daysUntilNextPurchase >= 30 && daysUntilNextPurchase < 60) {
 		return 'not soon';
+	} else if (!daysUntilNextPurchase) {
+		return 'inactive';
+	} else if (!daysSinceLastPurchase) {
+		return 'inactive';
 	}
 };
diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx
@@ -71,7 +71,7 @@ export function ListItem({
 		}
 	}, [isChecked, itemId, listPath]);
 
-	const urgency = calculateUrgency(daysUntilNextPurchase, dateLastPurchased);
+	let urgency = calculateUrgency(daysUntilNextPurchase, dateLastPurchased);
 	const label = { inputProps: { 'aria-label': `${name}` } };
 	let chipBackgroundColor;
 
@@ -117,6 +117,7 @@ export function ListItem({
 							sx={{
 								marginRight: 2,
 								backgroundColor: chipBackgroundColor,
+								width: 75,
 							}}
 						/>
 						<Button

diff --git a/src/views/List.jsx b/src/views/List.jsx
@@ -130,6 +130,7 @@ export function List({ data, listPath }) {
 	const addItemForm = () => {
 		return (
 			<section className="addAnItemForm">
+				{/* {alertText(submitted)} */}
 				<form onSubmit={handleSubmit}>
 					{/* Add item form for larger screens */}
 					<Box
@@ -139,7 +140,6 @@ export function List({ data, listPath }) {
 							<Grid item>
 								<Typography variant="h4">Add an item</Typography>
 							</Grid>
-							{alertText(submitted)}
 							<Grid item xs>
 								<FormControl variant="standard" fullWidth>
 									<InputLabel htmlFor="itemName">Enter item name:</InputLabel>
@@ -183,7 +183,7 @@ export function List({ data, listPath }) {
 							<AccordionSummary expandIcon={<ExpandMoreIcon />}>
 								Add an item +{' '}
 							</AccordionSummary>
-							{alertText(submitted)}
+							{/* {alertText(submitted)} */}
 							<AccordionDetails>
 								<FormControl variant="standard">
 									<InputLabel htmlFor="itemName">Enter item name:</InputLabel>
@@ -357,5 +357,10 @@ export function List({ data, listPath }) {
 		setSearchTerm('');
 	};
 
-	return <>{data.length === 0 ? renderAddFirstItemCTA() : renderItemList()}</>;
+	return (
+		<>
+			{alertText(submitted)}
+			{data.length === 0 ? renderAddFirstItemCTA() : renderItemList()}
+		</>
+	);
 }