Skip to content

Commit df83bc7

Browse files
authored
Merge pull request #75 from APPS-sookmyung/feature/add-card-of-two
Feat: 명함 2장 등록 및 디테일 수정
2 parents 04e6ff6 + 5449b46 commit df83bc7

File tree

13 files changed

+358
-276
lines changed

13 files changed

+358
-276
lines changed

src/components/CardInfo/CardInfo.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
66

77
export default function CardInfo({
88
name,
9+
team,
910
job,
1011
company,
1112
imageUrl,
@@ -30,7 +31,7 @@ export default function CardInfo({
3031
<S.Info>
3132
<S.Name isSelected={isSelected}>{name}</S.Name>
3233
<S.Job isSelected={isSelected}>
33-
{job}, {company}
34+
{job} / {team}, {company}
3435
</S.Job>
3536
</S.Info>
3637
</S.CardWrapper>

src/components/SearchBar/SearchBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function SearchBar({ theme }) {
99
const placeholderText =
1010
theme === 'white'
1111
? '명함을 검색해주세요'
12-
: '이름, 직책, 이메일, 휴대폰, 유선전화, 부서, 회사 등을 입력하세요';
12+
: '이름, 직책, 이메일, 휴대폰, 유선전화, 부서, 회사명 등을 입력하세요';
1313

1414
return (
1515
<S.SearchBar theme={theme}>

src/constants/cardData.js

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
const sampleData = [
22
{
3+
id: 1,
34
name: '박유진',
4-
job: '프로덕트 디자이너',
5+
job: '사원',
6+
team: '디자인팀',
57
company: '숙명여자대학교',
68
phone: '010-0000-1111',
79
email: 'yj@wellet.co.kr',
@@ -12,8 +14,10 @@ const sampleData = [
1214
memo: '내일 미팅',
1315
},
1416
{
17+
id: 2,
1518
name: '한은영',
16-
job: '프론트엔드 개발자',
19+
job: '사원',
20+
team: '개발팀',
1721
company: '숙명여자대학교',
1822
phone: '010-1111-2222',
1923
email: 'ey@wellet.co.kr',
@@ -24,8 +28,10 @@ const sampleData = [
2428
memo: '',
2529
},
2630
{
31+
id: 3,
2732
name: '이영희',
28-
job: '백엔드 개발자',
33+
job: '사원',
34+
team: '개발팀',
2935
company: 'WELLET Corp.',
3036
phone: '010-2222-3333',
3137
email: 'yh@wellet.co.kr',
@@ -36,8 +42,10 @@ const sampleData = [
3642
memo: '',
3743
},
3844
{
45+
id: 4,
3946
name: '김현우',
4047
job: '프론트엔드 개발자',
48+
team: '신규서비스팀',
4149
company: 'WELLET Corp.',
4250
phone: '010-3333-4444',
4351
email: 'hw@wellet.co.kr',
@@ -48,8 +56,10 @@ const sampleData = [
4856
memo: '',
4957
},
5058
{
59+
id: 5,
5160
name: '김디공',
52-
job: '대표',
61+
job: '사원',
62+
team: '',
5363
company: '다공 부동산',
5464
phone: '010-4444-5555',
5565
email: 'dg@wellet.co.kr',
@@ -60,8 +70,10 @@ const sampleData = [
6070
memo: '',
6171
},
6272
{
73+
id: 6,
6374
name: '홍길동',
64-
job: '대표 | 공인중개사',
75+
job: '대표',
76+
team: '',
6577
company: '동네공인중개사',
6678
phone: '010-5555-6666',
6779
email: 'gd@wellet.co.kr',
@@ -72,8 +84,10 @@ const sampleData = [
7284
memo: '',
7385
},
7486
{
87+
id: 7,
7588
name: '김인쇄',
76-
job: '공인중개사',
89+
job: '대표',
90+
team: '',
7791
company: '인쇄픽부동산',
7892
phone: '010-6666-7777',
7993
email: 'is@wellet.co.kr',
@@ -84,8 +98,10 @@ const sampleData = [
8498
memo: '',
8599
},
86100
{
101+
id: 8,
87102
name: '박대기',
88-
job: '보도본부 사회팀 / 기자',
103+
job: '기자',
104+
team: '보도본부 사회팀',
89105
company: 'KBS',
90106
phone: '010-7777-8888',
91107
email: 'dk@wellet.co.kr',
@@ -96,9 +112,11 @@ const sampleData = [
96112
memo: '',
97113
},
98114
{
115+
id: 9,
99116
name: '홍길동',
100-
job: '팀장 / PD',
101-
company: 'KBS VJ 특공대',
117+
job: '팀장, PD',
118+
team: '시사교양팀, VJ 특공대',
119+
company: 'KBS',
102120
phone: '010-8888-9999',
103121
email: 'kd@wellet.co.kr',
104122
tel: '81-2-222-0123',

src/constants/cardsSampleData.js

Lines changed: 24 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/nextDevelopItems/EmailLoginPage/EmailLoginPage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function EmailLoginPage() {
2121
<S.Text>우리(WE)들이 사용하는 월렛</S.Text>
2222
</S.TitleBox>
2323
<S.InputBox>
24-
<S.Input placeholder='아이디 / 이메일 주소'></S.Input>
24+
<S.Input placeholder='아이디 / 이메일'></S.Input>
2525
<S.Input placeholder='비밀번호'></S.Input>
2626
<S.Options>
2727
<S.IdSave

0 commit comments

Comments
 (0)