Merge branch 'develop' into 120-reviews

Dium-dev · Sep 12, 2023 · 5fbe098 · 5fbe098
2 parents a6c615b + d4ea48e
commit 5fbe098
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 35 deletions.
diff --git a/src/assets/icons/CardCredit.tsx b/src/assets/icons/CardCredit.tsx
@@ -5,13 +5,15 @@ export default function CardCredit() {
     <svg
       xmlns="http://www.w3.org/2000/svg"
       fill="none"
+      width="100%"
+      height="100%"
       viewBox="0 0 24 24"
-      stroke="currentColor"
+      stroke="#8C0303"
     >
       <path
         stroke-linecap="round"
         stroke-linejoin="round"
-        d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 002.25-2.25V6.75A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25v10.5A2.25 2.25 0 004.5 19.5z"
+        d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 002.25-2.25V6.75A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25v10.5A2.25 2.25 0 004.5 19.5z"  
       />
     </svg>
   );

diff --git a/src/assets/icons/Shield.tsx b/src/assets/icons/Shield.tsx
@@ -6,7 +6,7 @@ export default function Shield() {
       xmlns="http://www.w3.org/2000/svg"
       fill="none"
       viewBox="0 0 24 24"
-      stroke="currentColor"
+      stroke="#8C0303"
     >
       <path
         stroke-linecap="round"

diff --git a/src/assets/icons/Truck.tsx b/src/assets/icons/Truck.tsx
@@ -6,7 +6,7 @@ export default function Truck() {
       xmlns="http://www.w3.org/2000/svg"
       fill="none"
       viewBox="0 0 24 24"
-      stroke="currentColor"
+      stroke="#8C0303"
     >
       <path
         stroke-linecap="round"

diff --git a/src/components/paymentMethod/payMethod.tsx b/src/components/paymentMethod/payMethod.tsx
@@ -1,22 +1,24 @@
 import { IconTypes } from '~/types/icons';
 import IconText from '../IconText';
+import Icon from '~/assets/icons/icon';
 interface PaymentMethodProps {
   imageSrc: IconTypes;
   title: string;
-  link: string;
+  description: string;
 }
 
 const PaymentMethod: React.FC<PaymentMethodProps> = ({
   imageSrc,
   title,
-  link,
+  description
 }) => {
   return (
-    <div className="flex justify-between items-center mr-5 ml-5">
-      <a className="flex items-center" href={link} data-title="Medios de pago">
-        <IconText icon={imageSrc} text=""/>
-        <div>{title}</div>
-      </a>
+    <div className="flex flex-col items-center mr-5 ml-5">
+        <div className="h-[100px] w-[100px]">
+          <Icon icon={imageSrc}/>          
+        </div>
+        <h2 className='text-2xl font-bold text-primary-lm'>{title}</h2>
+        <div className='w-[300px] text-center'>{description}</div>
     </div>
   );
 };

diff --git a/src/components/paymentMethod/paymentMethodsList.tsx b/src/components/paymentMethod/paymentMethodsList.tsx
@@ -4,42 +4,23 @@ import PaymentMethod from './payMethod';
 const PaymentMethodsComponent: React.FC = () => {
   return (
     <>
-      <div className="flex justify-center bg-gray-200">
-        <div className="max-w-6xl p-4 ">
-          <div className="rounded-lg shadow-md p-4 flex flex-row h-20 justify-center bg-secondary-background ">
+          <div className="p-4 flex flex-wrap justify-around items-center">
             <PaymentMethod
               imageSrc='CardCredit'
-              title="Tarjeta de Credito"
-              link="/gz/home/payments/methods"
-            />
-            <PaymentMethod
-              imageSrc='Cash'
-              title="Efectivo"
-              link="/gz/home/payments/methods"
+              title="Todos los medios de pago"
+              description="trud nisi nostrud nostrud incididunt fugiat. Enim nostrud tempor cillum ea velit."
             />
             <PaymentMethod
               imageSrc='Truck'
               title="Envio a todo el pais"
-              link="/gz/home/payments/methods"
+              description="trud nisi nostrud nostrud incididunt fugiat. Enim nostrud tempor cillum ea velit."
             />
             <PaymentMethod
               imageSrc='Shield'
               title="Compra Segura"
-              link="/gz/home/payments/methods"
-            />
-            <PaymentMethod
-              imageSrc='warranty'
-              title="Grarantia"
-              link="/gz/home/payments/methods"
-            />
-            <PaymentMethod
-              imageSrc='MapLocation'
-              title="Bogota D.C"
-              link="/gz/home/payments/methods"
+              description="trud nisi nostrud nostrud incididunt fugiat. Enim nostrud tempor cillum ea velit."
             />
           </div>
-        </div>
-      </div>
     </>
   );
 };