Skip to content

Commit

Permalink
Merge pull request #37 from APPS-sookmyung/dev
Browse files Browse the repository at this point in the history
merge: dev to main
  • Loading branch information
misung-dev authored Jul 30, 2024
2 parents 10adddb + 2c2fdf0 commit 0ec3ecf
Show file tree
Hide file tree
Showing 10 changed files with 107 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

-

<br />

## 📸 스크린샷

<img width="250" alt="" src="">
103 changes: 98 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,109 @@
<div align="center">

# 2024-APPS 프로젝트 <WELLET>
### 📇 온라인 명함 보관 서비스 📇

📇 온라인 명함 보관 서비스 📇
![wellet logo](/src/assets/images/logo-description-wellet.png)

</div>
<br>

## 팀원
## 👪 개발 팀 소개

- Front-end: 김준희, 김혜림, 류미성
- Back-end: 주아정, 이해림, 하예영
<table >
<tr align="center">
<td width="100px">
<a href="https://github.com/junheekim61" target="_blank">
<img src="https://avatars.githubusercontent.com/u/100200965?v=4" alt="김준희 프로필" />
</a>
</td>
<td width="100px">
<a href="https://github.com/kimhyerims" target="_blank">
<img src="https://avatars.githubusercontent.com/u/144879107?v=4" alt="김혜림 프로필" />
</a>
</td> <td width="100px">
<a href="https://github.com/misung-dev" target="_blank">
<img src="https://avatars.githubusercontent.com/u/128569095?v=4" alt="류미성 프로필" />
</a>
</td> <td width="100px">
<a href="https://github.com/lhaerim" target="_blank">
<img src="https://avatars.githubusercontent.com/u/128566763?v=4" alt="이해림 프로필" />
</a>
</td> <td width="100px">
<a href="https://github.com/ajung7038" target="_blank">
<img src="https://avatars.githubusercontent.com/u/80907516?v=4" alt="주아정 프로필" />
</a>
</td> <td width="100px">
<a href="https://github.com/hayeyoung" target="_blank">
<img src="https://avatars.githubusercontent.com/u/144807080?v=4" alt="하예영 프로필" />
</a>
</td>
</tr>

<tr align="center">
<td>
<a href="https://github.com/junheekim61" target="_blank">
김준희<br>(컴퓨터과학전공 22)
</a>
</td>
<td>
<a href="https://github.com/kimhyerims" target="_blank">
김혜림<br>(데이터사이언스 23)
</a>
</td>
<td align="center">
<a href="https://github.com/misung-dev" target="_blank">
류미성<br>(컴퓨터과학전공 21)
</a>
</td>
<td>
<a href="https://github.com/lhaerim" target="_blank">
이해림<br>(컴퓨터과학전공 23)
</a>
</td>
<td>
<a href="https://github.com/ajung7038" target="_blank">
주아정<br>(컴퓨터과학전공 23)
</a>
</td><td>
<a href="https://github.com/hayeyoung" target="_blank">
하예영<br>(데이터사이언스 23)
</a>
</td>
</tr>

<tr align="center">
<td>
<p>Front-end</p>
</td>
<td>
<p>Front-end</p>
</td>
<td>
<p>Front-end</p>
</td>
<td>
<p>Back-end</p>
</td>
<td>
<p>Back-end</p>
</td>
<td>
<p>Back-end</p>
</td>
</tr>

</table>

<br />

| 이름 | 역할 | 개발 내용 |
| :----: | :-------: | :---------------------------------------------------------------------------------------------------------------------------------------------: |
| 김준희 | Front-end | 온보딩 페이지 구현 <br> 카카오톡 로그인 페이지 구현 <br> 홈 화면 페이지 구현 |
| 김혜림 | Front-end | 명함 상세 보기 페이지 구현<br> 명함 정보 수정하기 페이지 구현 <br> 그룹 수정 모달 구현 <br> 내 명함 보기 페이지 구현<br> 내 명함 공유 모달 구현 |
| 류미성 | Front-end | Header, 검색창, Tab bar 등 컴포넌트 구현<br> 명함 추가 페이지 구현 (사진 추가, 직접 입력) <br> 그룹별 명함 보기 페이지 구현 |
| 이혜림 | Back-end | |
| 주아정 | Back-end | |
| 하예영 | Back-end | |

<br>

Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>WELLET</title>
<link rel="icon" href="/src/assets/images/favicon-wellet.png" />
</head>

<body>
Expand Down
Binary file added src/assets/images/favicon-wellet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/logo-description-wellet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/logo-wellet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/CardInfo/CardInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function CardInfo({
<S.Info>
<S.Name isSelected={isSelected}>{name}</S.Name>
<S.Job isSelected={isSelected}>
{job} | {company}
{job}, {company}
</S.Job>
</S.Info>
</S.CardWrapper>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/AddCardPage/AddCardPage.style.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from '@emotion/styled';

export const AddCardPage = styled.div`
padding: 20px 20px 100px 20px;
padding: 0 20px 100px 20px;
`;

// 타이틀
Expand Down
3 changes: 2 additions & 1 deletion src/pages/ViewCardPage/ViewCardPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ export default function ViewCardPage() {
)}
</S.EditBadgeWrapper>
</S.ButtonContainer>
{/* 명함 */}

{/* 명함 목록 */}
<S.CardContainer>
{filteredData.map((data, index) => (
<CardInfo
Expand Down
3 changes: 2 additions & 1 deletion src/pages/ViewCardPage/ViewCardPage.style.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from '@emotion/styled';

export const ViewCardPage = styled.div`
padding: 20px 20px 100px 20px;
padding: 0 20px 100px 20px;
`;

// 버튼
Expand All @@ -16,6 +16,7 @@ export const GroupBadgeWrapper = styled.div`
gap: 5px;
overflow-x: auto;
white-space: nowrap;
scrollbar-width: none;
`;

export const EditBadgeWrapper = styled.div`
Expand Down

0 comments on commit 0ec3ecf

Please sign in to comment.