Merge branch 'main' into 466-feat-popup-on-edit-wheel-when-user-leaves

BinaryStudioAcademy · Sep 28, 2024 · 671bf7b · 671bf7b
2 parents 9a8c3d5 + c9ff3c3
commit 671bf7b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/apps/frontend/src/assets/img/note.svg b/apps/frontend/src/assets/img/note.svg
diff --git a/apps/frontend/src/libs/components/button/styles.module.css b/apps/frontend/src/libs/components/button/styles.module.css
@@ -55,8 +55,6 @@
 }
 
 .light-label {
-	padding-right: 10px;
-	padding-left: 10px;
 	color: var(--medium-light-gray);
 }
 

diff --git a/apps/frontend/src/libs/components/task-card/task-card.tsx b/apps/frontend/src/libs/components/task-card/task-card.tsx
@@ -74,7 +74,7 @@ const TaskCard: React.FC<Properties> = ({
 			className={getValidClassNames(styles["card"], styles[`card-${variant}`])}
 		>
 			<div className={styles["card-header"]}>
-				<Category categoryName={task.categoryName} />
+				<Category categoryName={task.categoryName} variant={variant} />
 				{isActive && (
 					<Deadline
 						deadline={(task as TaskDto).dueDate}
@@ -99,6 +99,7 @@ const TaskCard: React.FC<Properties> = ({
 							<div className={styles["button-container"]}>
 								<Button
 									hasVisuallyHiddenLabel
+									iconColor={iconColor}
 									iconName="note"
 									iconPosition="left"
 									label="notes"

diff --git a/apps/frontend/src/pages/root/components/circular-progress/circular-progress.tsx b/apps/frontend/src/pages/root/components/circular-progress/circular-progress.tsx
@@ -10,7 +10,7 @@ type Properties = {
 
 const CircularProgress: React.FC<Properties> = ({ percentage }: Properties) => {
 	const [isVisible, setIsVisible] = useState<boolean>(false);
-	const RADIUS = 90;
+	const RADIUS = 80;
 	const circumference = Math.PI * RADIUS;
 	const offset =
 		circumference - (percentage / TOTAL_PERCENTAGE) * circumference;

diff --git a/apps/frontend/src/pages/tasks/tasks.tsx b/apps/frontend/src/pages/tasks/tasks.tsx
@@ -58,7 +58,10 @@ const Tasks: React.FC = () => {
 		for (const task of tasks) {
 			const timeToDeadline = getMillisecondsLeft(currentTime, task.dueDate);
 
-			if (timeToDeadline < MillisecondsPerUnit.MINUTE) {
+			if (
+				timeToDeadline < MillisecondsPerUnit.MINUTE &&
+				task.status === TaskStatus.CURRENT
+			) {
 				expired.push(task);
 			} else {
 				active.push(task);