Merge branch 'main' into develop

SWEET-DEVELOPERS · May 20, 2024 · 3410e08 · 3410e08
2 parents 32b81f0 + fd4e6fb
commit 3410e08
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,15 @@
 <div>
-  <img align="left" src="https://cdn.discordapp.com/attachments/1187801115425771641/1197493329630330960/sweetlogo_128x128.png?ex=65bb7792&is=65a90292&hm=6a313638edfd8c992eab5fe1945e4172f88f0ea5dc8becb4da400f07eb8ba2a1&" width="160"/>
-  <div align="right">
+  <div align="left">
     <a align="right" href="https://github.com/SWEET-DEVELOPERS/sweet-client">
     </a>
     <h1 align="left">
+      <img align="left" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/d406abdb-ae33-494f-a59a-56df5bc7cb68" width="160"/>
       <font align="left" size="6" color="#FF2176"> 🍭SWEET </font>
     </h1>
+
+### 모두의 의견을 모아 하나의 선물로, SWEET
+      
+  </div>
     <div align="left">
       <a href="https://hits.seeyoufarm.com"><img src="https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FSWEET-DEVELOPERS%2Fsweet-client&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false"/></a>
       <img src="https://img.shields.io/github/issues-raw/SWEET-DEVELOPERS/sweet-client?color=176842">
@@ -21,14 +25,8 @@
 <br/>
 <br/>
 <br/>
-
-<div align="center"> 
-<h2>모두의 의견을 모아 하나의 선물로, SWEET</h2>
-</div>
 </a>
 
-<br/>
-
 ### 🔎 많은 사람이 한 사람의 선물을 고르는 과정에서 힘들었던 경험 있으신가요?
 	셀 수 없이 늘어나는 선물 단톡방, 갯수가 너무 많아 헷갈리는 선물 링크,
 	선물을 받는 사람(리시버)이 어떤 선물을 좋아하는지도 헷갈립니다.
@@ -93,11 +91,12 @@
 
 | 화면                                                                                                                              | 기능                                                                         |
 | --------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| <img width="250px" alt="Screenshot 2024-01-02 at 10 07 48 AM" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/1df42ed4-c174-4e55-bdbb-e36655674981"/>  | <b>로그인 기능</b> <br> 카카오톡 소셜 로그인                  |
-| <img width="250px" alt="Screenshot 2024-01-02 at 10 15 05 AM" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/b026641e-dcf9-4419-a656-59327824f484">  | <b>새 선물 준비 정보 입력 기능</b> <br> 새로운 선물 준비하기를 원하면 토너먼트 기한, 썸네일 등을 입력                   
-| <img width="250px" alt="Screenshot 2024-01-02 at 10 08 56 AM" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/ce053343-10e0-4722-bb51-5ffcd4861642">  | <b>선물 토너먼트 링크 공유 기능</b> <br> 정보 입력 후 생성된 링크를 카카오톡으로 공유 가능   |
-| <img width="250px" alt="Screenshot 2024-01-02 at 10 15 47 AM" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/d867939d-9f15-4b10-bb09-7950dcf16a6f"> | <b>선물 등록 기능</b> <br> 선물 링크와 가격 등록 시 토너먼트 아이템으로 추가         |
-| <img width="250px" alt="Screenshot 2024-01-02 at 10 17 03 AM" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/ab783a96-576b-485e-a390-36ca14266152">  | <b>토너먼트 기능</b> <br> 설정한 기한 동안 토너먼트 진행 후 순위 결과 확인 및 공유 가능 |
+| <img width="250px" alt="스윗-소셜로그인-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/ba1e44e4-12b1-468b-b15c-042235ce8dbd"/>  | <b>로그인 기능</b> <br> 카카오톡 소셜 로그인                  |
+| <img width="250px" alt="스윗-새-선물-준비-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/b64be8ac-718b-488d-98f4-8eb832e9ecb2">  | <b>새 선물 준비 정보 입력 기능</b> <br> 새로운 선물 준비하기를 원하면 토너먼트 기한, 썸네일 등을 입력            |       
+| <img width="250px" alt="스윗-선물방-링크-공유-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/5283b701-9a28-4c0b-a852-1db6f2493226">  | <b>선물 준비방 링크 공유 기능</b> <br> 정보 입력 후 생성된 링크를 카카오톡으로 공유 가능   |
+| <img width="250px" alt="스윗-선물-등록-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/252e807a-3846-4f4b-b4e6-f644b6401340">  | <b>선물 등록 기능</b> <br> 링크 입력 혹은 직접 입력을 통해 토너먼트 선물 아이템 등록         |
+| <img width="250px" alt="스윗-선물홈-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/085b5d52-a7b2-4396-b15e-709076b2e15c">  | <b>선물홈 화면</b> <br> 선물방 관련 정보 확인 가능         |
+| <img width="250px" alt="스윗-토너먼트-결과-이미지" src="https://github.com/SWEET-DEVELOPERS/sweet-client/assets/92876819/f76f24e8-0f74-4463-9d95-536535e75d7e">  | <b>토너먼트 기능</b> <br> 설정한 기간 동안 토너먼트 진행 후 순위 결과 확인 및 공유 가능         |
 </div>
 
 <br/>
@@ -169,19 +168,18 @@
 | Library              | ![React](https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=black) ![React Query](https://img.shields.io/badge/-React%20Query-FF4154?style=for-the-badge&logo=react%20query&logoColor=white) ![React Hook Form](https://img.shields.io/badge/React%20Hook%20Form-%23EC5990.svg?style=for-the-badge&logo=reacthookform&logoColor=white)                                                                                                              |
 | Programming Language | ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6.svg?style=for-the-badge&logo=TypeScript&logoColor=white)                                                                                             |
 | Styling              | ![Styled Components](https://img.shields.io/badge/styled--components-DB7093?style=for-the-badge&logo=styled-components&logoColor=white)                                                                           |
-| State Management     | ![State Management](https://img.shields.io/badge/recoil-f26b00?style=for-the-badge&logo=Recoil)                                                                                                                   |
 | Formatting           | ![ESLint](https://img.shields.io/badge/ESLint-4B3263?style=for-the-badge&logo=eslint&logoColor=white) ![Prettier](https://img.shields.io/badge/Prettier-F7B93E?style=for-the-badge&logo=prettier&logoColor=white) |
 | Version Control      | ![Git](https://img.shields.io/badge/git-%23F05033.svg?style=for-the-badge&logo=git&logoColor=white) ![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)  |
-| ETC                  | ![Mock Service Worker Badge](https://img.shields.io/badge/Mock%20Service%20Worker-FF6A33?logo=mockserviceworker&logoColor=fff&style=flat)
+| CI/CD                  | 	![GitHub Actions](https://img.shields.io/badge/github%20actions-%232671E5.svg?style=for-the-badge&logo=githubactions&logoColor=white)  |
 | Deployment           | ![Vercel](https://img.shields.io/badge/vercel-%23000000.svg?style=for-the-badge&logo=vercel&logoColor=white)
 </div>
 <br/>
 
 <div>
 
-| 배포 페이지 | 데모 페이지 | 노션 페이지 |
-| :---:  |:---: | :---: |
-| <a>배포 페이지</a> | <a>데모 페이지</a> | <a href="https://www.notion.so/Sweet-7359b4c53bc84202a0bc37431d8d5bfd?pvs=4"> 👉 Notion Project 바로가기 </a> |
+| 배포 페이지 | 노션 페이지 |
+| :---: | :---: |
+| <a href="https://sweetgift.kr"> 🍭 SWEET 바로가기 </a>  | <a href="https://www.notion.so/Sweet-7359b4c53bc84202a0bc37431d8d5bfd?pvs=4"> 👉 Notion Project 바로가기 </a> |
  </div>
 <br/>
 
@@ -192,8 +190,9 @@
 
 <div>
 
-| 👀 프로젝트 소개 | 🤝 협업 전략 | 🧯 트러블슈팅 | 🧐 더 나은 개발을 위한 논의 모음 |
-| :--------------: | :----------: | :--------------------: | :--------------------: 
-| <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EC%84%9C%EB%B9%84%EC%8A%A4-%ED%94%8C%EB%A1%9C%EC%9A%B0'>서비스 플로우</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8-%EC%A3%BC%EC%9A%94-%EA%B8%B0%EB%8A%A5-%EC%86%8C%EA%B0%9C'>프로젝트 주요 기능 소개</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EA%B8%B0%EC%88%A0-%EC%8A%A4%ED%83%9D-%EC%86%8C%EA%B0%9C-%EB%B0%8F-%EC%84%A0%ED%83%9D-%EC%9D%B4%EC%9C%A0'>기술 스택 소개 및 선택 이유</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%95%B5%EC%8B%AC-Hooks-%EC%84%A4%EB%AA%85'>핵심 Hooks 설명</a></li></ul> | <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Git-Convention'>Git Convention</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Coding-Convention'>Coding Convention</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%8F%B4%EB%8D%94-%EA%B5%AC%EC%A1%B0'>폴더 구조</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EB%85%B8%EC%85%98-%ED%99%9C%EC%9A%A9'>노션 활용</a></li></ul> |  |
+| 👀 프로젝트 소개 | 🤝 협업 전략 | 🧯 트러블슈팅 | 🧐 더 나은 개발을 위한 노력 | 🤔 더 나은 선택을 위한 논의 |
+| :--------------: | :----------: | :--------------------: | :--------------------: | :--------------------: 
+| <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EC%84%9C%EB%B9%84%EC%8A%A4-%ED%94%8C%EB%A1%9C%EC%9A%B0'>서비스 플로우</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8-%EC%A3%BC%EC%9A%94-%EA%B8%B0%EB%8A%A5-%EC%86%8C%EA%B0%9C'>프로젝트 주요 기능 소개</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EA%B8%B0%EC%88%A0-%EC%8A%A4%ED%83%9D-%EC%86%8C%EA%B0%9C-%EB%B0%8F-%EC%84%A0%ED%83%9D-%EC%9D%B4%EC%9C%A0'>기술 스택 소개 및 선택 이유</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%95%B5%EC%8B%AC-Hooks-%EC%84%A4%EB%AA%85'>핵심 Hooks 설명</a></li></ul> | <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Git-Convention'>Git Convention</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Coding-Convention'>Coding Convention</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%8F%B4%EB%8D%94-%EA%B5%AC%EC%A1%B0'>폴더 구조</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EB%85%B8%EC%85%98-%ED%99%9C%EC%9A%A9'>노션 활용</a></li></ul> |  | <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Layout-%EA%B3%BC-outlet%EC%9D%84-%ED%99%9C%EC%9A%A9%ED%95%B4-%ED%99%95%EC%9E%A5%EC%84%B1-%EA%B0%9C%EC%84%A0%ED%95%98%EA%B8%B0'>Layout 과 outlet을 활용해 확장성 개선</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/mixin%EC%9D%84-%ED%99%9C%EC%9A%A9%ED%95%98%EC%97%AC-style-%EC%BD%94%EB%93%9C-%EA%B0%80%EB%8F%85%EC%84%B1-%EB%B0%8F-%EC%9E%AC%EC%82%AC%EC%9A%A9%EC%84%B1-%EA%B0%9C%EC%84%A0'>mixin을 활용하여 style 코드 가독성 및 재사용성 개선</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/Github-Actions-%EB%8F%84%EC%9E%85%EC%9D%84-%ED%86%B5%ED%95%9C-%EC%9E%91%EC%97%85-%ED%9A%A8%EC%9C%A8-%EA%B0%9C%EC%84%A0'>Github Actions 도입을 통한 작업 효율 개선</a></li></ul> | <ul><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EB%B0%B0%ED%8F%AC-%ED%88%B4%EC%97%90-%EB%8C%80%ED%95%9C-%EB%85%BC%EC%9D%98'>배포 툴에 대한 논의</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EC%96%B8%EC%96%B4-%EB%B0%8F-React-vs-Next.js-%EB%85%BC%EC%9D%98'>언어 및 React vs Next.js 논의</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%EC%8A%A4%ED%83%80%EC%9D%BC%EB%A7%81-%EB%9D%BC%EC%9D%B4%EB%B8%8C%EB%9F%AC%EB%A6%AC-%EB%85%BC%EC%9D%98'>스타일링 라이브러리 논의</a></li><li><a href='https://github.com/SWEET-DEVELOPERS/sweet-client/wiki/%ED%8C%A8%ED%82%A4%EC%A7%80%EB%A7%A4%EB%8B%88%EC%A0%80-%EB%85%BC%EC%9D%98(pnpm-vs-yarn)'>패키지 매니저 논의(pnpm vs yarn)</a></li></ul>
+
 
 </div>