From ef8d107a646546445c6fd6bd637de7bb37471372 Mon Sep 17 00:00:00 2001
From: Mahdi Ghajary <46849131+mmahdigh@users.noreply.github.com>
Date: Wed, 24 Jul 2024 23:05:01 +0330
Subject: [PATCH 1/2] Merge pull request #223 from
 GeneralMagicio/reward-banner#119

Reward banner#119
---
 .../components/CategoryRewardBanner.tsx       | 25 +++++++++++++++++++
 src/app/categories/page.tsx                   |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/app/categories/components/CategoryRewardBanner.tsx

diff --git a/src/app/categories/components/CategoryRewardBanner.tsx b/src/app/categories/components/CategoryRewardBanner.tsx
new file mode 100644
index 0000000..ce867ad
--- /dev/null
+++ b/src/app/categories/components/CategoryRewardBanner.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+const CategoryRewaredBanner: React.FC = () => {
+	return (
+		<div className='mt-5 flex w-full  flex-col   bg-[#180207] p-[16px] shadow-lg'>
+			<div className='flex  items-center gap-[16px] self-stretch'>
+				<div className='flex  flex-[1_0_0]   items-center justify-between'>
+					<p className='font-inter text-pretty text-sm font-semibold leading-6 text-white'>
+						You&apos;ve got a chance to claim OP! Click &quot;Check
+						Eligibility&quot; to see if you&apos;re eligible.
+						Don&apos;t forget to review your badge group and check
+						which raffles you can enter.
+					</p>
+				</div>
+				<a target='_blank' href='https://unitap.app/prizetap'>
+					<button className='rounded-md   bg-[#FF0420] p-[8px] text-sm text-white'>
+						Check Elegibility
+					</button>
+				</a>
+			</div>
+		</div>
+	);
+};
+
+export default CategoryRewaredBanner;
diff --git a/src/app/categories/page.tsx b/src/app/categories/page.tsx
index a9a881c..de98387 100644
--- a/src/app/categories/page.tsx
+++ b/src/app/categories/page.tsx
@@ -10,7 +10,7 @@ import { useRouter } from 'next/navigation';
 import LogoutModal from '../components/LogoutModal';
 import CategoryCardView from './components/CategoryCardView';
 import CategoryToggleButton from './components/CategoryToggleButton';
-import { Countdown } from './components/Countdown';
+import CategoryRewaredBanner from './components/CategoryRewardBanner';
 
 const CategoriesPage = () => {
 	const [isModalOpen, setModalOpen] = useState(false);
@@ -43,7 +43,7 @@ const CategoriesPage = () => {
 	};
 	return (
 		<div className='px-4'>
-			<Countdown />
+			<CategoryRewaredBanner />
 			<CategoryPairwiseModal
 				isOpen={isModalOpen}
 				close={closeModal}

From 8dfd39898223f1181fa04cdf9e64fc0d5c35f6d5 Mon Sep 17 00:00:00 2001
From: Lovel George <36924734+lovelgeorge99@users.noreply.github.com>
Date: Thu, 25 Jul 2024 15:14:39 -0400
Subject: [PATCH 2/2] made copy changes and other changes

---
 .../[categoryId]/project-ranking/done/page.tsx  |  8 +++++---
 .../[categoryId]/project-ranking/edit/page.tsx  |  6 +++---
 .../[categoryId]/project-ranking/page.tsx       |  2 +-
 .../project-ranking/summary/page.tsx            | 17 +++++++++++------
 src/app/components/TopNavigation.tsx            |  2 +-
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/app/categories/[categoryId]/project-ranking/done/page.tsx b/src/app/categories/[categoryId]/project-ranking/done/page.tsx
index 0eb08ff..84a2c66 100644
--- a/src/app/categories/[categoryId]/project-ranking/done/page.tsx
+++ b/src/app/categories/[categoryId]/project-ranking/done/page.tsx
@@ -32,7 +32,9 @@ const ProjectRankingDonePage = () => {
 					width={250}
 					height={250}
 				/>
-				<p className='mx-auto text-lg font-bold'>Filtering done!</p>
+				<p className='mx-auto text-[28px] font-bold'>
+					Fantastic job filtering
+				</p>
 				<p className='mx-auto text-ph'>
 					{' '}
 					Now let&apos;s find out which projects come out on top!
@@ -52,13 +54,13 @@ const ProjectRankingDonePage = () => {
 						// 	});
 						// }
 						router.push(
-							`${Routes.Categories}/${categoryId}/project-ranking/summary`,
+							`${Routes.Categories}/${categoryId}/pairwise-ranking`,
 						);
 					}}
 					// disabled={updateCategoryMarkFiltered.isPending}
 					className='w-full bg-primary'
 				>
-					Start Pairwise Assesment
+					Start Ranking
 				</Button>
 			</div>
 		</div>
diff --git a/src/app/categories/[categoryId]/project-ranking/edit/page.tsx b/src/app/categories/[categoryId]/project-ranking/edit/page.tsx
index 02ea76a..c1fde1b 100644
--- a/src/app/categories/[categoryId]/project-ranking/edit/page.tsx
+++ b/src/app/categories/[categoryId]/project-ranking/edit/page.tsx
@@ -169,7 +169,7 @@ const ProjectRankingEditPage = () => {
 							Not Selected ({excludedProjects?.length || 0})
 						</p>
 						{excludedProjects?.map(project => (
-							<div key={project.id} className='opacity-40'>
+							<div key={project.id}>
 								<CategoryEditProjectItem
 									project={project}
 									key={project.id}
@@ -190,9 +190,9 @@ const ProjectRankingEditPage = () => {
 								`${Routes.Categories}/${selectedCategory?.id}/project-ranking/summary`,
 							);
 						}}
-						className='w-full text-black shadow-md'
+						className='w-full text-black  shadow-md'
 					>
-						Discard Changes
+						Discard
 					</Button>
 					<Button
 						onClick={handleSubmit}
diff --git a/src/app/categories/[categoryId]/project-ranking/page.tsx b/src/app/categories/[categoryId]/project-ranking/page.tsx
index 5bbdbf2..253a9e0 100644
--- a/src/app/categories/[categoryId]/project-ranking/page.tsx
+++ b/src/app/categories/[categoryId]/project-ranking/page.tsx
@@ -103,7 +103,7 @@ const ProjectRankingPage = () => {
 	useEffect(() => {
 		if (backendCurrentIndex === -1) {
 			router.push(
-				`${Routes.Categories}/${categoryId}/project-ranking/done`,
+				`${Routes.Categories}/${categoryId}/project-ranking/summary`,
 			);
 		}
 	}, [backendCurrentIndex, router, categoryId]);
diff --git a/src/app/categories/[categoryId]/project-ranking/summary/page.tsx b/src/app/categories/[categoryId]/project-ranking/summary/page.tsx
index 6f91d0d..66fb19e 100644
--- a/src/app/categories/[categoryId]/project-ranking/summary/page.tsx
+++ b/src/app/categories/[categoryId]/project-ranking/summary/page.tsx
@@ -62,13 +62,18 @@ const ProjectRankingSummaryPage = () => {
 				</div>
 				<div className='mx-4'>
 					<div className='mb-4 mt-6'>
-						<p className='font text-2xl font-bold'>
+						<p className='font text-[28px] font-bold leading-[34px]'>
 							{includedProjects?.length || 0} out of{' '}
-							{projects?.data.length || 0} projects selected
+							{projects?.data.length || 0}{' '}
+							<span className='text-[#636779]'>
+								projects selected
+							</span>
 						</p>
 					</div>
-					<p className='mb-6 text-lg'>{selectedCategory?.name}</p>
-					<p className='text-lg font-semibold'>
+					<p className='mb-6 text-lg font-semibold'>
+						{selectedCategory?.name}
+					</p>
+					<p className='text-lg font-bold'>
 						Selected ({includedProjects?.length || 0})
 					</p>
 					{includedProjects?.map(project => (
@@ -110,12 +115,12 @@ const ProjectRankingSummaryPage = () => {
 								data: { cid: +selectedCategoryId },
 							});
 							router.push(
-								`${Routes.Categories}/${selectedCategory?.id}/pairwise-ranking`,
+								`${Routes.Categories}/${categoryId}/project-ranking/done`,
 							);
 						}}
 						className='w-full bg-primary'
 					>
-						Start ranking
+						Finish Filtering
 					</Button>
 				</div>
 			</div>
diff --git a/src/app/components/TopNavigation.tsx b/src/app/components/TopNavigation.tsx
index a13dad2..e49cbe7 100644
--- a/src/app/components/TopNavigation.tsx
+++ b/src/app/components/TopNavigation.tsx
@@ -13,7 +13,7 @@ const TopNavigation = ({ link = '/', text }: ITopNavigationProps) => {
 				<Link href={link}>
 					<IconArrowLeft />
 				</Link>
-				<p>{text}</p>
+				<p className='font-bold'>{text}</p>
 			</div>
 		</div>
 	);