From 0d88ecebbfc7af298905b62953c9d4c4f3f1a225 Mon Sep 17 00:00:00 2001
From: Sumit Aggarwal <sumitaggarwal@Sumits-MacBook-Air.local>
Date: Sun, 8 Dec 2024 20:22:45 +0530
Subject: [PATCH 1/3] text changed  on about-us page / replace monthly passes
 to Gift passes

---
 react-fm/src/pages/Rewards/Rewards.tsx         |  2 +-
 react-fm/src/pages/aboutUs/AboutUs.module.scss | 10 +---------
 react-fm/src/pages/aboutUs/AboutUs.tsx         | 15 ++++++---------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/react-fm/src/pages/Rewards/Rewards.tsx b/react-fm/src/pages/Rewards/Rewards.tsx
index 2c6fa2e7..b6f8cecf 100644
--- a/react-fm/src/pages/Rewards/Rewards.tsx
+++ b/react-fm/src/pages/Rewards/Rewards.tsx
@@ -55,7 +55,7 @@ function Rewards() {
             Get Free Games
           </Typography>
           <Typography variant="h5" className={styles.primaryHeading}>
-            Monthly passes and flickmatch rewards coming soon...
+            Gift passes and flickmatch rewards coming soon...
           </Typography>
           <Typography variant="h6" className={styles.secondaryHeading}>
             Sign up to know more.
diff --git a/react-fm/src/pages/aboutUs/AboutUs.module.scss b/react-fm/src/pages/aboutUs/AboutUs.module.scss
index cbcc65cc..a6c033c3 100644
--- a/react-fm/src/pages/aboutUs/AboutUs.module.scss
+++ b/react-fm/src/pages/aboutUs/AboutUs.module.scss
@@ -17,16 +17,8 @@
   display: block;
   padding: 15px 15px;
   font-weight: 600;
-  color: #fff;
-  margin-top: 30px;
-  font-family: 'CustomFont', Arial, sans-serif;
-}
-
-.journey {
   color: #4ce95a;
-  font-weight: 600;
-  margin-top: 20px;
-  letter-spacing: 0.5px;
+  margin-top: 30px;
   font-family: 'CustomFont', Arial, sans-serif;
 }
 
diff --git a/react-fm/src/pages/aboutUs/AboutUs.tsx b/react-fm/src/pages/aboutUs/AboutUs.tsx
index 25f6d016..15759915 100644
--- a/react-fm/src/pages/aboutUs/AboutUs.tsx
+++ b/react-fm/src/pages/aboutUs/AboutUs.tsx
@@ -17,20 +17,17 @@ function AboutUs() {
         <Typography variant="h3" className={styles.ourStory}>
           Our Story
         </Typography>
-        <Typography variant="h4" className={styles.journey}>
-          We&#39;re on a Journey
-        </Typography>
 
         <Typography className={isPortrait ? styles.mobileMotto : styles.motto}>
-          FlickMatch is envisioned to be a matchmaking, player record keeping and ranking platform
-          for casual sports in India and USA.
+          FlickMatch is a match making, player record keeping and ranking platform for casual sports
+          in India and USA.
         </Typography>
 
         <Typography className={isPortrait ? styles.mobileDescription : styles.description}>
-          While playing casual sports such as an evening game of football (soccer), an interested
-          person would have to find 13 other interested people and find a 7v7 ground. This is
-          tedious and de-motivational. We&#39;re a bunch of people building processes and technology
-          to enhance local sports.
+          While playing sports such as an evening game of football (soccer), an interested person
+          would have to find 13 other interested people and find a 7v7 ground. This is tedious and
+          de-motivational. We&#39;re a bunch of people building processes and technology to enhance
+          local sports.
         </Typography>
 
         <Typography className={isPortrait ? styles.mobileAim : styles.aim}>

From c6af9cf6cd0fb8318662bc3c53ab2a676ed73e46 Mon Sep 17 00:00:00 2001
From: Sumit Aggarwal <sumitaggarwal@Sumits-MacBook-Air.local>
Date: Sun, 8 Dec 2024 21:06:11 +0530
Subject: [PATCH 2/3] changed rewards to gift pass

---
 react-fm/src/pages/Rewards/Rewards.module.scss | 2 +-
 react-fm/src/routes/index.ts                   | 2 +-
 react-fm/src/sections/Header/Header.tsx        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/react-fm/src/pages/Rewards/Rewards.module.scss b/react-fm/src/pages/Rewards/Rewards.module.scss
index 0714669b..787b935a 100644
--- a/react-fm/src/pages/Rewards/Rewards.module.scss
+++ b/react-fm/src/pages/Rewards/Rewards.module.scss
@@ -79,7 +79,7 @@
   font-weight: 600;
   margin-top: 3rem;
   margin-bottom: 3rem;
-  font-family: 'CustomFont', Arial, sans-serif;
+  font-family: 'Poppins', Arial, sans-serif;
   // margin-right: -10px;
 }
 
diff --git a/react-fm/src/routes/index.ts b/react-fm/src/routes/index.ts
index 04e7d871..5aa4fdce 100644
--- a/react-fm/src/routes/index.ts
+++ b/react-fm/src/routes/index.ts
@@ -64,7 +64,7 @@ const routes: Routes = {
   [Pages.Rewards]: {
     component: asyncComponentLoader(() => import('@/pages/Rewards')),
     path: '/rewards',
-    title: 'Rewards',
+    title: 'Gift Pass',
     icon: AttachMoneyIcon,
   },
   [Pages.AddTurfPage]: {
diff --git a/react-fm/src/sections/Header/Header.tsx b/react-fm/src/sections/Header/Header.tsx
index e71f9c1e..5a9cc233 100644
--- a/react-fm/src/sections/Header/Header.tsx
+++ b/react-fm/src/sections/Header/Header.tsx
@@ -149,7 +149,7 @@ const Header = () => {
         </Typography>
         <Divider className={styles.divider} orientation="vertical" flexItem />
         <Typography className={styles.menuItem} component={Link} to="/rewards">
-          Rewards
+          Gift Pass
         </Typography>
 
         {userState.login.isAdmin && userState.login.isLoggedIn ? (

From d05f3aca1e14977fca815d7ba28dfd8f69ab6857 Mon Sep 17 00:00:00 2001
From: Sumit Aggarwal <sumitaggarwal@Sumits-MacBook-Air.local>
Date: Sun, 8 Dec 2024 22:33:59 +0530
Subject: [PATCH 3/3] button font reverted

---
 react-fm/src/pages/Rewards/Rewards.module.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-fm/src/pages/Rewards/Rewards.module.scss b/react-fm/src/pages/Rewards/Rewards.module.scss
index 787b935a..0714669b 100644
--- a/react-fm/src/pages/Rewards/Rewards.module.scss
+++ b/react-fm/src/pages/Rewards/Rewards.module.scss
@@ -79,7 +79,7 @@
   font-weight: 600;
   margin-top: 3rem;
   margin-bottom: 3rem;
-  font-family: 'Poppins', Arial, sans-serif;
+  font-family: 'CustomFont', Arial, sans-serif;
   // margin-right: -10px;
 }