Merge pull request #2570 from beckn/fix/all-apps-bugs

fix(climateData): all apps bugs
beckn · Nov 22, 2024 · 305e00c · 305e00c
2 parents f3a193a + f6ee8b9
commit 305e00c
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 17 deletions.
diff --git a/apps/dragon-foods/components/cart/cart.module.css b/apps/dragon-foods/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/dragon-foods/components/cart/cart.tsx b/apps/dragon-foods/components/cart/cart.tsx
@@ -81,6 +81,7 @@ const Cart: React.FC<CartProps> = ({
               <Typography
                 variant="subTitleRegular"
                 text="Request Overview"
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/dragon-foods/components/header/constants/index.ts b/apps/dragon-foods/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/earth-support-initiative/components/cart/cart.module.css b/apps/earth-support-initiative/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/earth-support-initiative/components/cart/cart.tsx b/apps/earth-support-initiative/components/cart/cart.tsx
@@ -81,6 +81,7 @@ const Cart: React.FC<CartProps> = ({
               <Typography
                 variant="subTitleRegular"
                 text="Request Overview"
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/earth-support-initiative/components/header/constants/index.ts b/apps/earth-support-initiative/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/envirogrowth/components/cart/cart.module.css b/apps/envirogrowth/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/envirogrowth/components/cart/cart.tsx b/apps/envirogrowth/components/cart/cart.tsx
@@ -83,6 +83,7 @@ const Cart: React.FC<CartProps> = ({
                 variant="subTitleRegular"
                 text="Request Overview"
                 dataTest={testIds.request_overview}
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/envirogrowth/components/header/constants/index.ts b/apps/envirogrowth/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/harmoni-aids/components/cart/cart.module.css b/apps/harmoni-aids/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/harmoni-aids/components/cart/cart.tsx b/apps/harmoni-aids/components/cart/cart.tsx
@@ -81,6 +81,7 @@ const Cart: React.FC<CartProps> = ({
               <Typography
                 variant="subTitleRegular"
                 text="Request Overview"
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/harmoni-aids/components/header/constants/index.ts b/apps/harmoni-aids/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/sky-analytics/components/cart/cart.module.css b/apps/sky-analytics/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/sky-analytics/components/cart/cart.tsx b/apps/sky-analytics/components/cart/cart.tsx
@@ -81,6 +81,7 @@ const Cart: React.FC<CartProps> = ({
               <Typography
                 variant="subTitleRegular"
                 text="Request Overview"
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/sky-analytics/components/header/constants/index.ts b/apps/sky-analytics/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/state-forest-department/components/cart/cart.module.css b/apps/state-forest-department/components/cart/cart.module.css
@@ -15,6 +15,6 @@
   margin: 0 auto;
 
   @media (min-width: 768px) {
-    max-width: 60%;
+    max-width: 75%;
   }
 }
diff --git a/apps/state-forest-department/components/cart/cart.tsx b/apps/state-forest-department/components/cart/cart.tsx
@@ -81,6 +81,7 @@ const Cart: React.FC<CartProps> = ({
               <Typography
                 variant="subTitleRegular"
                 text="Request Overview"
+                sx={{ paddingBottom: '20px' }}
               />
               <CartList cartItems={cartItems} />
             </Box>

diff --git a/apps/state-forest-department/components/header/constants/index.ts b/apps/state-forest-department/components/header/constants/index.ts
@@ -25,7 +25,7 @@ const headerNames: PathnameObjectType = {
   '/feedback': '',
   '/profile': 'My Profile',
   '/search': 'Search results',
-  '/checkout': 'Billing & Shipping'
+  '/checkout': 'Billing'
 }
 
 const headerFrenchNames: PathnameObjectType = {

diff --git a/apps/state-forest-department/pages/_document.tsx b/apps/state-forest-department/pages/_document.tsx
@@ -5,7 +5,7 @@ export default function Document() {
       <Head>
         <meta
           name="description"
-          content="Dragon Foods"
+          content="State Forest Department"
         />
         <link
           rel="preconnect"
@@ -22,7 +22,7 @@ export default function Document() {
         />
         <link
           rel="shortcut icon"
-          href="/images/headerLogo.svg"
+          href="/images/StateForestDepartment.svg"
         />
       </Head>
       <body>

diff --git a/packages/becknified-components/src/components/checkout/checkout-item-details.tsx b/packages/becknified-components/src/components/checkout/checkout-item-details.tsx
@@ -31,7 +31,7 @@ const ItemDetails: React.FC<ItemDetailProps> = ({
           <Box mr="1rem">
             <Image
               src={image}
-              alt={title}
+              alt={title.length > 15 ? `${title.substring(0, 15)}...` : title}
               width="4rem"
               height="4rem"
             />

diff --git a/packages/common/src/components/searchAndDiscover/searchAndDiscover.module.css b/packages/common/src/components/searchAndDiscover/searchAndDiscover.module.css
@@ -0,0 +1,9 @@
+.hideScroll {
+  overflow-y: scroll; /* or auto, as per your requirements */
+  scrollbar-width: none; /* Hides scrollbar in Firefox */
+  -ms-overflow-style: none; /* Hides scrollbar in IE/Edge */
+}
+
+.hideScroll::-webkit-scrollbar {
+  display: none; /* Hides scrollbar in Chrome, Safari, and Opera */
+}
diff --git a/packages/common/src/components/searchAndDiscover/searchAndDiscover.tsx b/packages/common/src/components/searchAndDiscover/searchAndDiscover.tsx
@@ -9,7 +9,7 @@ import CustomFilterIconComponent from '../cutomFilterIcon'
 import { setLocalStorage } from '../../utils'
 import { SearchAndDiscoverProps } from './searchAndDiscover.types'
 import { testIds } from '@shared/dataTestIds'
-
+import Styles from './searchAndDiscover.module.css'
 const SearchAndDiscover: React.FC<SearchAndDiscoverProps> = ({
   items,
   searchProps,
@@ -73,7 +73,7 @@ const SearchAndDiscover: React.FC<SearchAndDiscoverProps> = ({
 
   return (
     <Box
-      className="hideScroll"
+      className={Styles.hideScroll}
       maxH="calc(100vh - 95px)"
       overflowY="scroll"
     >