From 8e1e5531705b2c5bdda4a722863bd0ee7f47ec71 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 5 Jan 2024 14:44:43 +0200
Subject: [PATCH 1/5] fix:make task column to take majority width  of team card

---
 apps/web/lib/features/team/user-team-card/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/lib/features/team/user-team-card/index.tsx b/apps/web/lib/features/team/user-team-card/index.tsx
index abf36816f..fb36242e5 100644
--- a/apps/web/lib/features/team/user-team-card/index.tsx
+++ b/apps/web/lib/features/team/user-team-card/index.tsx
@@ -147,7 +147,7 @@ export function UserTeamCard({
 				<TaskInfo
 					edition={taskEdition}
 					memberInfo={memberInfo}
-					className="2xl:w-80 3xl:w-[32rem] w-1/5 lg:px-4 px-2 overflow-y-hidden"
+					className="flex-1 lg:px-4 px-2 overflow-y-hidden"
 					publicTeam={publicTeam}
 				/>
 				<VerticalSeparator className="ml-2" />
@@ -174,7 +174,7 @@ export function UserTeamCard({
 				{/* TodayWorkedTime */}
 				<TodayWorkedTime
 					isAuthUser={memberInfo.isAuthUser}
-					className="flex-1 lg:text-base text-xs 3xl:w-[12rem]"
+					className="w-1/5 lg:px-3 2xl:w-52 3xl:w-64"
 					memberInfo={memberInfo}
 				/>
 

From 242afe083840b92abcd25fdb29dcca3673ee3167 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 5 Jan 2024 15:11:47 +0200
Subject: [PATCH 2/5] fix: adjust Tasks column width

---
 apps/web/lib/features/task/task-card.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx
index e8c5c475b..e7ba09861 100644
--- a/apps/web/lib/features/task/task-card.tsx
+++ b/apps/web/lib/features/task/task-card.tsx
@@ -108,7 +108,7 @@ export function TaskCard(props: Props) {
 			<Card
 				shadow="bigger"
 				className={clsxm(
-					'lg:flex items-center justify-between py-3 px-4 md:px-4 hidden min-h-[7rem] dark:bg-[#101217] border-[0.125rem] dark:border-[#FFFFFF0D] relative',
+					'lg:flex items-center justify-between py-3 px-4 md:px-4 hidden min-h-[7rem] dark:bg-[#1E2025] border-[0.125rem] dark:border-[#FFFFFF0D] relative',
 					active && ['border-primary-light dark:bg-[#1E2025]'],
 					'gap-5',
 					className
@@ -118,11 +118,11 @@ export function TaskCard(props: Props) {
 					<DraggerIcon className="fill-[#CCCCCC] dark:fill-[#4F5662]" />
 				</div>
 
-				<div className="w-[35%] flex flex-row justify-between">
+				<div className="flex-1 flex flex-row justify-between">
 					{/* Task information */}
 					<TaskInfo
 						task={task}
-						className="px-4 2xl:w-96 md:w-80"
+						className="px-4 w-full"
 						taskBadgeClassName={clsxm(taskBadgeClassName)}
 						taskTitleClassName={clsxm(taskTitleClassName)}
 					/>
@@ -145,7 +145,7 @@ export function TaskCard(props: Props) {
 				<VerticalSeparator />
 
 				{/* TaskTimes */}
-				<div className="flex items-center justify-between gap-[1.125rem] w-[25%] px-5">
+				<div className="flex items-center justify-between gap-[1.125rem]  px-5 w-1/5 lg:px-3 2xl:w-52 3xl:w-72">
 					<TaskTimes
 						activeAuthTask={activeAuthTask}
 						task={task}
@@ -172,7 +172,7 @@ export function TaskCard(props: Props) {
 				</div>
 				<VerticalSeparator />
 
-				<div className="flex flex-row justify-between items-center w-[25%]">
+				<div className="flex flex-row justify-between items-center w-1/5 lg:px-3 2xl:w-52 3xl:w-80">
 					{/* Active Task Status Dropdown (It's a dropdown that allows the user to change the status of the task.)*/}
 					<ActiveTaskStatusDropdown
 						task={task}
@@ -203,10 +203,10 @@ export function TaskCard(props: Props) {
 					)} */}
 				</div>
 				<div className="flex flex-wrap items-start justify-between pb-4 border-b">
-					<TaskInfo task={task} className="px-4 mb-4 w-80" />{' '}
+					<TaskInfo task={task} className="px-4 mb-4 w-full" />{' '}
 					{viewType === 'default' && (
 						<>
-							<div className="flex items-end space-x-2">
+							<div className="flex items-end mx-auto py-4 space-x-2">
 								<TaskEstimateInfo
 									memberInfo={memberInfo}
 									edition={taskEdition}
@@ -220,7 +220,7 @@ export function TaskCard(props: Props) {
 
 				{viewType === 'unassign' && (
 					<>
-						<UsersTaskAssigned className="px-3 w-52" task={task} />
+						<UsersTaskAssigned className="px-3 mx-auto w-full py-4" task={task} />
 					</>
 				)}
 				<div className="flex justify-between items-center mt-4 mb-4 space-x-5">

From d445d8bc8ae0133f21ddf96117ff53b8777afa87 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 5 Jan 2024 15:25:25 +0200
Subject: [PATCH 3/5] fix: dropdown position

---
 apps/web/lib/features/task/task-card.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx
index e7ba09861..c24f0d2fd 100644
--- a/apps/web/lib/features/task/task-card.tsx
+++ b/apps/web/lib/features/task/task-card.tsx
@@ -174,11 +174,13 @@ export function TaskCard(props: Props) {
 
 				<div className="flex flex-row justify-between items-center w-1/5 lg:px-3 2xl:w-52 3xl:w-80">
 					{/* Active Task Status Dropdown (It's a dropdown that allows the user to change the status of the task.)*/}
-					<ActiveTaskStatusDropdown
-						task={task}
-						onChangeLoading={(load) => setLoading(load)}
-						className="min-w-[10.625rem]"
-					/>
+					<div className="w-full flex items-center justify-center">
+						<ActiveTaskStatusDropdown
+							task={task}
+							onChangeLoading={(load) => setLoading(load)}
+							className="min-w-[10.625rem]"
+						/>
+					</div>
 
 					{/* TaskCardMenu */}
 					{task && memberInfo && currentMember && (

From f2bc4e1f4503a13a16bd7646cec9d6a9c03b2584 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 5 Jan 2024 15:33:21 +0200
Subject: [PATCH 4/5] fix: make clickable breabcumbs on profile

---
 apps/web/app/[locale]/profile/[memberId]/page.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/[locale]/profile/[memberId]/page.tsx b/apps/web/app/[locale]/profile/[memberId]/page.tsx
index c8e80cdce..7e82f78e3 100644
--- a/apps/web/app/[locale]/profile/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/profile/[memberId]/page.tsx
@@ -19,7 +19,7 @@ import stc from 'string-to-color';
 import { useRecoilValue } from 'recoil';
 import { fullWidthState } from '@app/stores/fullWidth';
 
-const Profile = () => {
+const Profile = ({ params }: { params: { memberId: string } }) => {
 	const profile = useUserProfilePage();
 	const { isTrackingEnabled, activeTeam } = useOrganizationTeams();
 	const fullWidth = useRecoilValue(fullWidthState);
@@ -27,7 +27,10 @@ const Profile = () => {
 	const hook = useTaskFilter(profile);
 
 	const t = useTranslations();
-	const breadcrumb = [{ title: activeTeam?.name || '', href: '/' }, ...JSON.parse(t('pages.profile.BREADCRUMB'))];
+	const breadcrumb = [
+		{ title: activeTeam?.name || '', href: '/' },
+		{ title: JSON.parse(t('pages.profile.BREADCRUMB')) || '', href: `/profile/${params.memberId}` }
+	];
 
 	const profileIsAuthUser = useMemo(() => profile.isAuthUser, [profile.isAuthUser]);
 	const hookFilterType = useMemo(() => hook.filterType, [hook.filterType]);

From 8f3a7c3f7a3a1c72200e88964bbbccaa97fcb67d Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 5 Jan 2024 15:34:47 +0200
Subject: [PATCH 5/5] fix: make clickable breabcumbs on task detail

---
 apps/web/app/[locale]/task/[id]/page.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/[locale]/task/[id]/page.tsx b/apps/web/app/[locale]/task/[id]/page.tsx
index 09099e00e..b285b4610 100644
--- a/apps/web/app/[locale]/task/[id]/page.tsx
+++ b/apps/web/app/[locale]/task/[id]/page.tsx
@@ -29,7 +29,10 @@ const TaskDetails = () => {
 
 	const id = params?.id;
 
-	const breadcrumb = [{ title: activeTeam?.name || '', href: '/' }, ...JSON.parse(t('pages.taskDetails.BREADCRUMB'))];
+	const breadcrumb = [
+		{ title: activeTeam?.name || '', href: '/' },
+		{ title: JSON.parse(t('pages.taskDetails.BREADCRUMB')), href: `/task/${id}` }
+	];
 
 	useEffect(() => {
 		if (