From e520748acf169dc154437fc1f4ceaecde729e3c8 Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 17:06:10 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Style:=20=ED=9C=B4=EC=A7=80=ED=86=B5=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=ED=81=AC=EA=B8=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon.svg | 4 ++-- src/pages/ViewCardPage/ViewCardPage.jsx | 4 +--- src/pages/ViewCardPage/ViewCardPage.style.jsx | 11 +++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/assets/icon.svg b/src/assets/icon.svg index c4e0b1e..833e1d2 100644 --- a/src/assets/icon.svg +++ b/src/assets/icon.svg @@ -176,8 +176,8 @@ - - + + diff --git a/src/pages/ViewCardPage/ViewCardPage.jsx b/src/pages/ViewCardPage/ViewCardPage.jsx index 3c7f73f..9daf3cc 100644 --- a/src/pages/ViewCardPage/ViewCardPage.jsx +++ b/src/pages/ViewCardPage/ViewCardPage.jsx @@ -72,9 +72,7 @@ export default function ViewCardPage() { 명함 삭제 - - - + {isEditCompleteVisible && ( diff --git a/src/pages/ViewCardPage/ViewCardPage.style.jsx b/src/pages/ViewCardPage/ViewCardPage.style.jsx index a7e7a73..7a68e4b 100644 --- a/src/pages/ViewCardPage/ViewCardPage.style.jsx +++ b/src/pages/ViewCardPage/ViewCardPage.style.jsx @@ -34,6 +34,11 @@ export const DeleteCardBadge = styled.button` gap: 8px; border-radius: 10px; background: var(--Color-4-1, #ffe6f2); + + svg { + width: 10px; + height: 11px; + } `; export const EditCompletedBadge = styled.button` @@ -56,12 +61,6 @@ export const BadgeText = styled.p` letter-spacing: -0.55px; `; -export const TrashIcon = styled.div` - width: 10px; - height: 11px; - flex-shrink: 0; -`; - // 명함 export const CardContainer = styled.div` display: flex; From 6b2b762b61fabcb0b7149dd3297c7767cd504afd Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 17:14:07 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Style:=20=EB=AA=85=ED=95=A8=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=82=B4=20=ED=99=94=EC=82=B4?= =?UTF-8?q?=ED=91=9C=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=95=88=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=B6=80=EB=B6=84=20=ED=95=B4=EA=B2=B0=20?= =?UTF-8?q?=EB=B0=8F=20a=20=ED=83=9C=EA=B7=B8=20=EB=B2=94=EC=9C=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon.svg | 4 +-- src/components/CardInfo/CardInfo.jsx | 52 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/assets/icon.svg b/src/assets/icon.svg index 833e1d2..7ca8c6d 100644 --- a/src/assets/icon.svg +++ b/src/assets/icon.svg @@ -21,8 +21,8 @@ - - + + diff --git a/src/components/CardInfo/CardInfo.jsx b/src/components/CardInfo/CardInfo.jsx index 73bc940..c9518d8 100644 --- a/src/components/CardInfo/CardInfo.jsx +++ b/src/components/CardInfo/CardInfo.jsx @@ -15,35 +15,35 @@ export default function CardInfo({ onClick = () => {}, }) { return ( - - - - {`${name} - - - {name} - - {job}, {company} - - - - {!isDeleteMode && ( - + + + + + {`${name} + + + {name} + + {job}, {company} + + + + {!isDeleteMode && ( - - )} - {isDeleteMode && ( - - - - )} - + )} + {isDeleteMode && ( + + + + )} + + ); } From 6522472d96b68a530b8f1d20660b82688663e9e5 Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 17:25:18 +0900 Subject: [PATCH 3/7] =?UTF-8?q?Style:=20=EB=AA=85=ED=95=A8=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20Icon=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20import=20=ED=95=B4=EC=98=A4?= =?UTF-8?q?=EB=8A=94=20=EA=B2=83=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon.svg | 11 +++++++++++ src/components/CardInfo/CardInfo.jsx | 12 ++++++------ src/components/CardInfo/CardInfo.style.jsx | 2 +- src/pages/CardDetailPage/CardDetailPage.jsx | 5 ++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/assets/icon.svg b/src/assets/icon.svg index 7ca8c6d..a19948b 100644 --- a/src/assets/icon.svg +++ b/src/assets/icon.svg @@ -205,4 +205,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/CardInfo/CardInfo.jsx b/src/components/CardInfo/CardInfo.jsx index c9518d8..261621e 100644 --- a/src/components/CardInfo/CardInfo.jsx +++ b/src/components/CardInfo/CardInfo.jsx @@ -1,15 +1,13 @@ -import React from 'react'; import PropTypes from 'prop-types'; import * as S from './CardInfo.style'; import Icon from '../../components/Icon/Icon'; import { Link } from 'react-router-dom'; -import ProfileImgDefault from '../../assets/images/profile-img-default.svg'; export default function CardInfo({ name, job, company, - imageUrl = ProfileImgDefault, + imageUrl, isDeleteMode = false, isSelected = false, onClick = () => {}, @@ -22,9 +20,11 @@ export default function CardInfo({ isSelected={isSelected} > - - {`${name} - + {imageUrl ? ( + {`${name} + ) : ( + + )} {name} diff --git a/src/components/CardInfo/CardInfo.style.jsx b/src/components/CardInfo/CardInfo.style.jsx index a7d719c..8c37a88 100644 --- a/src/components/CardInfo/CardInfo.style.jsx +++ b/src/components/CardInfo/CardInfo.style.jsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const Card = styled.a` +export const Card = styled.div` display: flex; justify-content: space-between; align-items: center; diff --git a/src/pages/CardDetailPage/CardDetailPage.jsx b/src/pages/CardDetailPage/CardDetailPage.jsx index 26e30b5..25042a5 100644 --- a/src/pages/CardDetailPage/CardDetailPage.jsx +++ b/src/pages/CardDetailPage/CardDetailPage.jsx @@ -1,10 +1,9 @@ -import React, { useState, useEffect } from 'react'; -import { useParams } from 'react-router-dom'; +import { useState, useEffect } from 'react'; +import { useParams, Link } from 'react-router-dom'; import * as S from './CardDetailPage.style'; import Icon from '../../components/Icon/Icon'; import { TabBar, BlueBadge } from '../../components'; import ProfileImgDefault from '../../assets/images/profile-img-default.svg'; -import { Link } from 'react-router-dom'; import CARDS_SAMPLE_DATA from '../../constants/cardsSampleData'; export default function CardDetailPage() { From dee9a86193fd2f7fb946e6d2399f55b5d3cfa372 Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 17:28:38 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Style:=20=EB=AA=85=ED=95=A8=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A1=A4=EB=B0=94=20=EC=88=A8=EA=B8=B0=EB=8A=94=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ViewCardPage/ViewCardPage.style.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/ViewCardPage/ViewCardPage.style.jsx b/src/pages/ViewCardPage/ViewCardPage.style.jsx index 7a68e4b..02df84a 100644 --- a/src/pages/ViewCardPage/ViewCardPage.style.jsx +++ b/src/pages/ViewCardPage/ViewCardPage.style.jsx @@ -2,6 +2,8 @@ import styled from '@emotion/styled'; export const ViewCardPage = styled.div` padding: 0 20px 100px 20px; + overflow-y: scroll; + scrollbar-width: none; `; // 버튼 From 813021be86ad4b14261bd3497e863223652c8dce Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 19:04:16 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Modify:=20=EC=82=AD=EC=A0=9C=EB=AA=A8?= =?UTF-8?q?=EB=93=9C=20=EC=9D=BC=EB=95=8C=20=EB=AA=85=ED=95=A8=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EB=B3=B4=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardInfo/CardInfo.jsx | 67 +++++++++++---------- src/pages/CardDetailPage/CardDetailPage.jsx | 2 +- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/components/CardInfo/CardInfo.jsx b/src/components/CardInfo/CardInfo.jsx index 261621e..bcf1a81 100644 --- a/src/components/CardInfo/CardInfo.jsx +++ b/src/components/CardInfo/CardInfo.jsx @@ -1,3 +1,4 @@ +import React from 'react'; import PropTypes from 'prop-types'; import * as S from './CardInfo.style'; import Icon from '../../components/Icon/Icon'; @@ -12,38 +13,42 @@ export default function CardInfo({ isSelected = false, onClick = () => {}, }) { - return ( - - - - {imageUrl ? ( - {`${name} - ) : ( - - )} - - {name} - - {job}, {company} - - - - {!isDeleteMode && ( - - - + const cardContent = ( + + + {imageUrl ? ( + {`${name} + ) : ( + )} - {isDeleteMode && ( - - - - )} - - + + {name} + + {job}, {company} + + + + {!isDeleteMode && ( + + + + )} + {isDeleteMode && ( + + + + )} + + ); + + return isDeleteMode ? ( + cardContent + ) : ( + {cardContent} ); } diff --git a/src/pages/CardDetailPage/CardDetailPage.jsx b/src/pages/CardDetailPage/CardDetailPage.jsx index 25042a5..1dc377a 100644 --- a/src/pages/CardDetailPage/CardDetailPage.jsx +++ b/src/pages/CardDetailPage/CardDetailPage.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import React, { useState, useEffect } from 'react'; import { useParams, Link } from 'react-router-dom'; import * as S from './CardDetailPage.style'; import Icon from '../../components/Icon/Icon'; From 04df6ed781770d2663319f147dc9446b08c460c6 Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 19:31:58 +0900 Subject: [PATCH 6/7] =?UTF-8?q?Fix:=20=EB=AA=85=ED=95=A8=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardInfo/CardInfo.jsx | 12 +++++++----- src/components/CardInfo/CardInfo.style.jsx | 6 ++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/CardInfo/CardInfo.jsx b/src/components/CardInfo/CardInfo.jsx index bcf1a81..8a9d8fe 100644 --- a/src/components/CardInfo/CardInfo.jsx +++ b/src/components/CardInfo/CardInfo.jsx @@ -20,11 +20,13 @@ export default function CardInfo({ isSelected={isSelected} > - {imageUrl ? ( - {`${name} - ) : ( - - )} + + {imageUrl ? ( + {`${name} + ) : ( + + )} + {name} diff --git a/src/components/CardInfo/CardInfo.style.jsx b/src/components/CardInfo/CardInfo.style.jsx index 8c37a88..ca4eb96 100644 --- a/src/components/CardInfo/CardInfo.style.jsx +++ b/src/components/CardInfo/CardInfo.style.jsx @@ -29,6 +29,12 @@ export const ProfileImgWrapper = styled.div` border-radius: 50%; object-fit: cover; } + svg { + width: 100%; + height: 100%; + border-radius: 50%; + object-fit: cover; + } `; export const Info = styled.div` From d91de90f9f0980e8cdea2c482464e31aac40d162 Mon Sep 17 00:00:00 2001 From: "misung.dev" Date: Mon, 19 Aug 2024 19:33:29 +0900 Subject: [PATCH 7/7] =?UTF-8?q?Modify:=20=EB=82=B4=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=82=AC=EC=9D=B4=EC=A6=88?= =?UTF-8?q?=EC=97=90=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MyCard/MyCard.style.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/MyCard/MyCard.style.jsx b/src/components/MyCard/MyCard.style.jsx index 263399b..01b37b0 100644 --- a/src/components/MyCard/MyCard.style.jsx +++ b/src/components/MyCard/MyCard.style.jsx @@ -16,6 +16,13 @@ export const ProfileImg = styled.div` max-height: 68px; border-radius: 50%; display: flex; + + img { + width: 100%; + height: 100%; + border-radius: 50%; + object-fit: cover; + } `; export const ProfileText = styled.div`