Skip to content

Commit

Permalink
Modify: 삭제모드 일때 명함 상세보기 페이지로 이동하는 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
misung-dev committed Aug 19, 2024
1 parent 656879b commit e33bf72
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 32 deletions.
67 changes: 36 additions & 31 deletions src/components/CardInfo/CardInfo.jsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -12,38 +13,42 @@ export default function CardInfo({
isSelected = false,
onClick = () => {},
}) {
return (
<Link to={`/card/${name}`}>
<S.Card
onClick={onClick}
isDeleteMode={isDeleteMode}
isSelected={isSelected}
>
<S.CardWrapper>
{imageUrl ? (
<img src={imageUrl} alt={`${name} 프로필`} />
) : (
<Icon id='profile-basic' fill='none' />
)}
<S.Info>
<S.Name isSelected={isSelected}>{name}</S.Name>
<S.Job isSelected={isSelected}>
{job}, {company}
</S.Job>
</S.Info>
</S.CardWrapper>
{!isDeleteMode && (
<S.ArrowIconWrapper>
<Icon id='arrow-right' fill='none' />
</S.ArrowIconWrapper>
const cardContent = (
<S.Card
onClick={onClick}
isDeleteMode={isDeleteMode}
isSelected={isSelected}
>
<S.CardWrapper>
{imageUrl ? (
<img src={imageUrl} alt={`${name} 프로필`} />
) : (
<Icon id='profile-basic' fill='none' />
)}
{isDeleteMode && (
<S.ArrowIconWrapper>
<Icon id={isSelected ? 'circle-check' : 'circle'} fill='none' />
</S.ArrowIconWrapper>
)}
</S.Card>
</Link>
<S.Info>
<S.Name isSelected={isSelected}>{name}</S.Name>
<S.Job isSelected={isSelected}>
{job}, {company}
</S.Job>
</S.Info>
</S.CardWrapper>
{!isDeleteMode && (
<S.ArrowIconWrapper>
<Icon id='arrow-right' fill='none' />
</S.ArrowIconWrapper>
)}
{isDeleteMode && (
<S.ArrowIconWrapper>
<Icon id={isSelected ? 'circle-check' : 'circle'} fill='none' />
</S.ArrowIconWrapper>
)}
</S.Card>
);

return isDeleteMode ? (
cardContent
) : (
<Link to={`/card/${name}`}>{cardContent}</Link>
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/CardDetailPage/CardDetailPage.jsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down

0 comments on commit e33bf72

Please sign in to comment.