Merge pull request #2776 from ever-co/fix/ui-improvements

[Improvement]: Profile Page | UI improvement
ever-co · Jul 20, 2024 · 7db14da · 7db14da
2 parents ad0a0cb + 730c663
commit 7db14da
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/apps/web/lib/features/task/daily-plan/future-tasks.tsx b/apps/web/lib/features/task/daily-plan/future-tasks.tsx
@@ -55,7 +55,7 @@ export function FutureTasks({ profile }: { profile: any }) {
 										<HorizontalSeparator />
 									</div>
 								</AccordionTrigger>
-								<AccordionContent className="bg-light--theme border-none dark:bg-dark--theme">
+								<AccordionContent className="border-none dark:bg-dark--theme">
 									<PlanHeader plan={plan} planMode="Future Tasks" />
 									<Droppable droppableId={plan.id as string} key={plan.id} type="task">
 										{(provided) => (
@@ -79,7 +79,7 @@ export function FutureTasks({ profile }: { profile: any }) {
 																	{...provided.dragHandleProps}
 																	style={{
 																		...provided.draggableProps.style,
-																		marginBottom: 8
+																		marginBottom: 4
 																	}}
 																>
 																	<TaskCard
@@ -94,6 +94,7 @@ export function FutureTasks({ profile }: { profile: any }) {
 																		taskTitleClassName="mt-[0.0625rem]"
 																		plan={plan}
 																		planMode="Future Tasks"
+																		className='shadow-[0px_0px_15px_0px_#e2e8f0]'
 																	/>
 																</div>
 															)}

diff --git a/apps/web/lib/features/task/daily-plan/outstanding-all.tsx b/apps/web/lib/features/task/daily-plan/outstanding-all.tsx
@@ -63,7 +63,7 @@ export function OutstandingAll({ profile }: OutstandingAll) {
 														{...provided.dragHandleProps}
 														style={{
 															...provided.draggableProps.style,
-															marginBottom: 8
+															marginBottom: 4
 														}}
 													>
 														<TaskCard
@@ -77,6 +77,7 @@ export function OutstandingAll({ profile }: OutstandingAll) {
 															taskBadgeClassName={`rounded-sm`}
 															taskTitleClassName="mt-[0.0625rem]"
 															planMode="Outstanding"
+															className='shadow-[0px_0px_15px_0px_#e2e8f0]'
 														/>
 													</div>
 												)}

diff --git a/apps/web/lib/features/task/daily-plan/outstanding-date.tsx b/apps/web/lib/features/task/daily-plan/outstanding-date.tsx
@@ -40,7 +40,7 @@ export function OutstandingFilterDate({ profile }: IOutstandingFilterDate) {
 										<HorizontalSeparator />
 									</div>
 								</AccordionTrigger>
-								<AccordionContent className="bg-light--theme border-none dark:bg-dark--theme pb-12">
+								<AccordionContent className="bg-transparent border-none dark:bg-dark--theme pb-12">
 									{/* Plan header */}
 									<PlanHeader plan={plan} planMode="Outstanding" />
 									<Droppable droppableId={plan.id as string} key={plan.id} type="task">

diff --git a/apps/web/lib/features/task/daily-plan/past-tasks.tsx b/apps/web/lib/features/task/daily-plan/past-tasks.tsx
@@ -47,7 +47,7 @@ export function PastTasks({ profile, currentTab = 'Past Tasks' }: { profile: any
 										<HorizontalSeparator />
 									</div>
 								</AccordionTrigger>
-								<AccordionContent className="bg-light--theme border-none dark:bg-dark--theme pb-12">
+								<AccordionContent className="border-none dark:bg-dark--theme pb-6">
 									{/* Plan header */}
 									<PlanHeader plan={plan} planMode="Outstanding" />
 									<Droppable
@@ -78,7 +78,7 @@ export function PastTasks({ profile, currentTab = 'Past Tasks' }: { profile: any
 																	{...provided.dragHandleProps}
 																	style={{
 																		...provided.draggableProps.style,
-																		marginBottom: 8
+																		marginBottom: 4
 																	}}
 																>
 																	<TaskCard
@@ -96,6 +96,7 @@ export function PastTasks({ profile, currentTab = 'Past Tasks' }: { profile: any
 																				? 'Past Tasks'
 																				: undefined
 																		}
+																		className='shadow-[0px_0px_15px_0px_#e2e8f0]'
 																	/>
 																</div>
 															)}

diff --git a/apps/web/lib/features/user-profile-plans.tsx b/apps/web/lib/features/user-profile-plans.tsx
@@ -213,7 +213,7 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 										<HorizontalSeparator />
 									</div>
 								</AccordionTrigger>
-								<AccordionContent className="bg-light--theme border-none dark:bg-dark--theme">
+								<AccordionContent className="bg-transparent border-none dark:bg-dark--theme">
 									<PlanHeader plan={plan} planMode={currentTab as any} />
 									<Droppable
 										droppableId={plan.id as string}
@@ -243,7 +243,7 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 																	{...provided.dragHandleProps}
 																	style={{
 																		...provided.draggableProps.style,
-																		marginBottom: 8
+																		marginBottom: 6
 																	}}
 																>
 																	<TaskCard
@@ -261,6 +261,7 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 																				: undefined
 																		}
 																		plan={plan}
+																		className='shadow-[0px_0px_15px_0px_#e2e8f0]'
 																	/>
 																</div>
 															)}
@@ -379,7 +380,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 
 	return (
 		<div
-			className={`mb-8 flex ${planMode === 'Future Tasks' ? 'justify-start' : 'justify-around'}  items-center gap-5`}
+			className={`mb-6 flex ${planMode === 'Future Tasks' ? 'justify-start' : 'justify-around'}  items-center gap-5`}
 		>
 			{/* Planned Time */}