Merge v2.0 into main

luisaramicar11 · Nov 2, 2024 · 52d708d · 52d708d
1 parent b749122
commit 52d708d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/src/app/user/discover/page.tsx b/src/app/user/discover/page.tsx
@@ -11,8 +11,8 @@ import styled from "styled-components";
 import CardUserDiscover from "@/src/components/cards/CardUserDiscover";
 import Button from "@/src/components/ui/buttons/Button";
 import { RiArrowGoBackFill } from "react-icons/ri";
-import { LuArrowUpAZ } from "react-icons/lu";
-import { TbArrowBadgeUpFilled } from "react-icons/tb";
+import { FaArrowDownAZ } from "react-icons/fa6";
+import { MdOutlineAlignHorizontalLeft } from "react-icons/md";
 import { GiNewShoot } from "react-icons/gi";
 
 const DiscoverPage = styled.div`
@@ -214,10 +214,10 @@ const Discover = () => {
               <RiArrowGoBackFill />
             </Button>
             <Button type={"button"} label={"A-Z"} onClick={handleShowAlphabeticalOrder}>
-              <LuArrowUpAZ />
+              <FaArrowDownAZ />
             </Button>
             <Button type={"button"} label={"Top"} onClick={handleShowTopUsers}>
-              <TbArrowBadgeUpFilled />
+              <MdOutlineAlignHorizontalLeft />
             </Button>
             <Button type={"button"} label={"Nuevos"} onClick={handleShowNewUsers}>
               <GiNewShoot />

diff --git a/src/components/cards/CardDetailUserMatch.tsx b/src/components/cards/CardDetailUserMatch.tsx
@@ -31,7 +31,7 @@ const ProfileContainer = styled.div`
     }
   }
 
-  @media (max-width: 900px) {
+  @media (max-width: 950px) {
       width: 100%;
     }
 `;
@@ -47,7 +47,7 @@ const Header = styled.div`
   border-radius: 10px;
   width: 100%;
 
-  @media (max-width: 900px) {
+  @media (max-width: 600px) {
       padding-top: 1rem;
     }
 `;
@@ -92,7 +92,7 @@ const ConnectionsRating = styled.div`
   margin: 0;
   padding-bottom: 0;
 
-  @media (max-width: 900px) {
+  @media (max-width: 600px) {
       flex-wrap: wrap;
       gap: 1rem;
     }
@@ -142,14 +142,16 @@ const Skills = styled.div`
 `;
 
 const UserDescription = styled.div`
-  width: 12rem;
+  min-width: 12rem;
+  max-width: 12rem;
+  padding-bottom: 0.5rem;
   min-height: 14.5rem;
   border-radius: 10px;
   border: 1px solid ${({ theme }) => theme.colors.textBlack};
   gap: 1rem;
 
-  @media (max-width: 900px) {
-      width: 100%;
+  @media (max-width: 600px) {
+      max-width: 100%;
     }
 `;
 
@@ -215,7 +217,7 @@ const DivContent = styled.div`
     gap: 1rem;
     padding-top: 1rem;
 
-    @media (max-width: 900px) {
+    @media (max-width: 600px) {
       flex-wrap: wrap;
     }
 `;
@@ -290,7 +292,7 @@ const MainInfo = styled.div`
   align-items: center;
   gap: 1rem;
 
-  @media (max-width: 900px) {
+  @media (max-width: 600px) {
       flex-wrap: wrap;
       gap: 0;
     }
@@ -384,6 +386,10 @@ const UserProfileDetail: React.FC<IRequestOnDetailUserCardProps> = ({ userData }
               <h3>Teléfono</h3>
               <span>{userDetail.phoneNumber}</span>
             </ContactInfo>
+            <ContactInfo>
+              <h3>Generación</h3>
+              <span>{userDetail.birthdate!.slice(0, 4)}</span>
+            </ContactInfo>
           </UserDescription>
           <MediaContainer>
             <H3>Enlaces Externos</H3>

diff --git a/src/components/cards/CardDetailUserNoMatch.tsx b/src/components/cards/CardDetailUserNoMatch.tsx
@@ -27,7 +27,7 @@ const ProfileContainer = styled.div`
     }
   }
 
-  @media (max-width: 900px) {
+  @media (max-width: 950px) {
       width: 100%;
     }
 `;

diff --git a/src/components/cards/CardDiscover.tsx b/src/components/cards/CardDiscover.tsx
@@ -25,7 +25,7 @@ const CardContainer = styled.div`
 
 // Estilo para la columna de la imagen
 const ImageColumn = styled.div`
-  width: 40%;
+  width: 55%;
   min-height: 16rem;
   max-height: 19rem;
 `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ const ProfileContainer = styled.div` @@
         }
       }
-      @media (max-width: 900px) {
+      @media (max-width: 950px) {
           width: 100%;
         }
     `;
@@ Expand Down @@