Merge branch 'dev' of github.com:codestates-seb/seb43_main_009 into FE

codestates-seb · Nov 21, 2023 · 56fe1dc · 56fe1dc
2 parents 786a408 + c0ebc9c
commit 56fe1dc
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 114 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,11 @@
 <br/>
 <div align="center">
 <br/>
-<img src="client/public/logo.png" style="width:200px;"/>
+<a href="https://www.dowajoyak.store" target="_blank">
+   <img src="client/public/logo.png" style="width:200px;"/>
+</a>
 <br/>
-<h3> 본인의 알러지 입력을 기반으로 한 약 검색서비스, 도와조약입니다. </h3>	
+<h3> 본인의 알러지 입력을 기반으로 한 약 검색서비스, 도와조약입니다 </h3>	
 <p align='center'>
   <a href="https://github.com/codestates-seb/seb43_main_009/issues">
     <img src="https://img.shields.io/badge/IDEA%20ISSUE%20-%23F7DF1E.svg?&style=for-the-badge&&logoColor=white"/>
@@ -41,7 +43,7 @@
 
 |<a href="https://github.com/yeomdogyeong"> 염도경 </a><br>FE Leader|<a href="https://github.com/ggggggggithub"> 김성수 </a><br>FE|<a href="https://github.com/nowaveosu"> 노호준 </a><br>FE|<a href="https://github.com/wlsljh0516"> 이진하A </a><br>FE|<a href="https://github.com/Sniij"> 조만기 </a><br>BE Leader|<a href="https://github.com/insooY"> 양인수 </a><br>BE|<a href="https://github.com/Gitdonghee"> 한동희 </a><br>BE|
 |---|---|---|---|---|---|---|
-|<img width="430px" height="95px" src="https://user-images.githubusercontent.com/82639552/235307158-1cb6146d-53a1-4c06-9f8e-9ab3b6557199.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307301-f1f52c06-781b-43ff-9493-d9e69c7ea118.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307316-087601a2-bf93-4bf3-a7b1-b128243ef242.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307329-5a37c265-ec9d-4a63-acd3-e3d5f69068b0.jpg"/>|<img width="430px" src="https://user-images.githubusercontent.com/82639552/235307385-877084c4-1a4d-4b61-9c2c-eec712e6bb3e.jpg"/>|<img width="500px" src="https://user-images.githubusercontent.com/82639552/235307351-71145bf5-c902-434b-90e3-9563385b9c71.jpg"/>|<img width="500px" src="https://user-images.githubusercontent.com/82639552/235307360-cd8e5f1d-ee0c-4295-bad2-278d072ccd5e.jpg"/>|
+|<img width="430px" src="https://user-images.githubusercontent.com/82639552/235307158-1cb6146d-53a1-4c06-9f8e-9ab3b6557199.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307301-f1f52c06-781b-43ff-9493-d9e69c7ea118.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307316-087601a2-bf93-4bf3-a7b1-b128243ef242.jpg"/>|<img width="550px" src="https://user-images.githubusercontent.com/82639552/235307329-5a37c265-ec9d-4a63-acd3-e3d5f69068b0.jpg"/>|<img width="430px" src="https://user-images.githubusercontent.com/82639552/235307385-877084c4-1a4d-4b61-9c2c-eec712e6bb3e.jpg"/>|<img width="500px" src="https://user-images.githubusercontent.com/82639552/235307351-71145bf5-c902-434b-90e3-9563385b9c71.jpg"/>|<img width="500px" src="https://user-images.githubusercontent.com/82639552/235307360-cd8e5f1d-ee0c-4295-bad2-278d072ccd5e.jpg"/>|
 
 
 </div>
@@ -58,10 +60,11 @@
 <h3>:hamster:FE_task_assignment:hamster:</h3>
 <br>
 
-|염도경|webpack 경로설정,공용 협업 툴 설정, 커뮤니티CRUD, 마이페이지, 토큰관리, 검색 메인페이지|
+|이름|기능구현|
 |:---:|---|
+|염도경|webpack 경로설정,공용 협업 툴 설정, 커뮤니티CRUD, 마이페이지, 토큰관리, 검색 메인페이지|
 |김성수|커뮤니티, 검색리스트|
-|노호준|헤더, 로그인, 회원가입, 맞춤추천페이지, 자동완성입력창|
+|노호준|헤더, 로그인, 회원가입, 구글 OAuth, 카카오 OAuth, 네이버 OAuth,  맞춤추천페이지, 자동완성 입력창구현|
 |이진하A|메인 페이지, 풋터, 검색 상세페이지|
 
 
@@ -76,36 +79,56 @@
 <details>
 <summary>조만기</summary>
 <div markdown="1">       
-
+
+- Git Branch strategy design <br/>
+- Github convention configuration <br/>
+- 커뮤니티 게시판 공동 구현 <br/>
 - OAuth2(Google) 구현<br/>
 - Spring Security configuration (For login, signup) <br/>
 - CORS configuration(security+S3)<br/>
 - JWT 구현 <br/>
 - OAuth2 + JWT 통합 <br/>
+- Refresh token을 통한 access token 재발급 API 구현<br/>
 - 외부 API 연동 후 커스텀하여 약 검색 API 구현 <br/>
+- 사용자 정보를 검색 데이터와 매핑시켜 사용자에 따라 보여지는 검색 데이터 가공 <br/>
 - JSON parsing service 구현<br/>
 - S3 버킷에 이미지를 올리는 API 구현 <br/>
 - Client와 통신을 위해 기본 배포 환경 configuration(EC2+RDS+S3) <br/>
 - 서버 환경 변수 리소스를 Parameter Store와 연동 configuration <br/>
 - 배포 도메인 안정성을 위해 https to https deploy configuration(ACM, CloudFront, ELB, Route 53) <br/>
 - Github Actions configuration(FE+BE, Code Deploy)<br/>
-- Refresh token을 통한 access token 재발급 API 구현<br/>
+- AWS IAM 유저 생성 후 권한 설정하여 팀원들이 AWS 서비스에 접속할 수 있도록 configuration
 - 커뮤니티 CRUD 기존 부분에서 token 검사를 통한 authorization logic으로 refactoring하여 보안성 높임 <br/>
-- 검색 API 기존 부분에서 기능별로 class 분리시켜 서로의 의존성을 떨어뜨려 유지보수 편의성과 안정성을 높임 <br/>
-  
+- 검색 API 기존 부분에서 기능별로 class 분리시켜 서로의 의존성을 떨어뜨리는 refactoring을 통해 유지보수 편의성과 안정성을 높임 <br/>
+
 </div>
 </details>
 
 
-|조만기||
-|---|---|
-|양인수||
-|한동희||
+<details>
+<summary>양인수</summary>
+<div markdown="1">       
+- OAuth2(Kakao) 구현<br/>
+- 커뮤니티 페이지 백앤드 구현 <br/>
+</div>
+</details>
+
 
+<details>
+<summary>한동희</summary>
+<div markdown="1">       
+- OAuth2(Naver) 구현<br/>
+- Spring Security configuration (For login, signup) <br/>
+- JWT 공동 구현 <br/>
+- OAuth2 + JWT 통합 <br/>
+- Survey 구현 <br/>
+- 커뮤니티 게시판 공동 구현 <br/>
+</div>
+</details>
   </div>
 
 <br/>
-<h2>Stacks used 🛒</h2>
+<h2>⚙️ 기술스택</h2>
 <div>
     <p style="font-weight: bold; font-size:30px">Tools</p>
 <table>
@@ -120,11 +143,11 @@
   </thead>
   <tbody>
     <tr>
-      <td align="center"> <img alt="Github" src="https://simpleicons.org/icons/github.svg" style="max-width: 100%"/> </td>
-      <td align="center"> <img alt="IntelliJ" src="https://simpleicons.org/icons/intellijidea.svg" width="50" > </td>
-      <td align="center"> <img alt="VSCode" src="https://simpleicons.org/icons/visualstudiocode.svg" width="50"> </td>
-      <td align="center"> <img alt="Discord" src="https://simpleicons.org/icons/discord.svg" width="50"></td>
-      <td align="center"> <img alt="Notion" src="https://simpleicons.org/icons/notion.svg" width="50"> </td>
+      <td align="center"> <img alt="Github" src="https://i.ibb.co/b79YbB3/291716-github-logo-social-network-social-icon.png" width="50"/> </td>
+      <td align="center"> <img alt="IntelliJ" src="https://user-images.githubusercontent.com/25181517/192108890-200809d1-439c-4e23-90d3-b090cf9a4eea.png" width="50" > </td>
+      <td align="center"> <img alt="VSCode" src="https://i.ibb.co/SwMG1sf/download-9.png" width="50"> </td>
+      <td align="center"> <img alt="Discord" src="https://i.ibb.co/QDLgLdS/discord-logo-discord-icon-transparent-free-png.webp" width="70"></td>
+      <td align="center"> <img alt="Notion" src="https://i.ibb.co/JyMLRY8/Notion-app-logo.png" width="50"> </td>
     </tr>
   </tbody>
 </table>
@@ -142,12 +165,12 @@
   </thead>
   <tbody>
     <tr>
-      <td align="center"> <img  alt="Java" src="https://techstack-generator.vercel.app/java-icon.svg" style="max-width: 100%"/> </td>
-      <td align="center"> <img alt="spring logo" src="https://simpleicons.org/icons/spring.svg" width="50" > </td>
-      <td align="center"> <img alt="spring-boot logo" src="https://simpleicons.org/icons/springboot.svg" width="60"> </td>
-      <td align="center"> <img alt="spring-security logo" src="https://simpleicons.org/icons/springsecurity.svg" width="60"></td>
-      <td align="center"> <img alt="MySQL" src="https://simpleicons.org/icons/mysql.svg" width="80"> </td>
-      <td align="center"> <img alt="AWS" src="https://simpleicons.org/icons/amazonaws.svg" width="70"> </td>
+      <td align="center"> <img  alt="Java" src="https://user-images.githubusercontent.com/25181517/117201156-9a724800-adec-11eb-9a9d-3cd0f67da4bc.png" width="60"/> </td>
+      <td align="center"> <img alt="spring logo" src="https://user-images.githubusercontent.com/25181517/117201470-f6d56780-adec-11eb-8f7c-e70e376cfd07.png" width="50" > </td>
+      <td align="center"> <img alt="spring-boot logo" src="https://user-images.githubusercontent.com/25181517/183891303-41f257f8-6b3d-487c-aa56-c497b880d0fb.png" width="60"> </td>
+      <td align="center"> <img alt="spring-security logo" src="https://i.ibb.co/CWX7HVk/download-7.png" alt="download-7" width="40"></td>
+      <td align="center"> <img alt="MySQL" src="https://user-images.githubusercontent.com/25181517/183896128-ec99105a-ec1a-4d85-b08b-1aa1620b2046.png" width="80"> </td>
+      <td align="center"> <img alt="AWS" src="https://user-images.githubusercontent.com/25181517/183896132-54262f2e-6d98-41e3-8888-e40ab5a17326.png" width="70"> </td>
     </tr>
   </tbody>
 </table>
@@ -157,30 +180,30 @@
     <tr>
       <th align="center"> React </th>
       <th align="center"> JavaScript </th>
-      <th align="center"> HTML </th>
-      <th align="center"> CSS </th>
-        <th align="center"> Webpack </th>
-	 <th align="center"> styled-components </th>
-	 <th align="center"> Redux </th>
+      <th align="center"> styled-components </th>
+      <th align="center"> Webpack </th>
+      <th align="center"> es-lint </th>
+      <th align="center"> prettier </th> 
+      <th align="center"> Redux </th>
     </tr>
   </thead>
   <tbody>
     <tr>      
-      <td align="center"> <img alt="React" src="https://simpleicons.org/icons/react.svg" width="60"></td>
-      <td align="center"> <img alt="JavaScript" src="https://simpleicons.org/icons/javascript.svg" style="max-width: 100%"/> </td>
-      <td align="center"> <img alt="HTML" src="https://simpleicons.org/icons/html5.svg" width="50" > </td>
-      <td align="center"> <img alt="CSS" src="https://simpleicons.org/icons/css3.svg" width="60"> </td>
-      <td align="center"> <img alt="CSS" src="https://simpleicons.org/icons/webpack.svg" width="60"> </td>
-       <td align="center"> <img alt="CSS" src="https://simpleicons.org/icons/styledcomponents.svg" width="60"> </td>
-        <td align="center"> <img alt="CSS" src="https://simpleicons.org/icons/redux.svg" width="60"> </td>
+      <td align="center"> <img alt="React" src="https://user-images.githubusercontent.com/25181517/183897015-94a058a6-b86e-4e42-a37f-bf92061753e5.png" width="60"></td>
+      <td align="center"> <img alt="JavaScript" src="https://user-images.githubusercontent.com/25181517/117447155-6a868a00-af3d-11eb-9cfe-245df15c9f3f.png" width="60"/> </td>
+      <td align="center"> <img alt="styled-components" src="https://i.ibb.co/stW53wm/img1-daumcdn.png" width="60"> </td>
+      <td align="center"> <img alt="Webpack" src="https://user-images.githubusercontent.com/25181517/187955008-981340e6-b4cc-441b-80cf-7a5e94d29e7e.png" width="60"> </td>
+      <td align="center"> <img alt="es-lint" src="https://i.ibb.co/ypr3Q2s/v-VGFTo-Ha-IT1489115329-cont.png" width="60"> </td>
+      <td align="center"> <img alt="prettier" src="https://i.ibb.co/8YTWnTd/25822731.png" width="60"> </td>
+      <td align="center"> <img alt="Redux" src="https://user-images.githubusercontent.com/25181517/187896150-cc1dcb12-d490-445c-8e4d-1275cd2388d6.png" width="60"> </td>
     </tr>
   </tbody>
 </table>
 
 </div>
 
 
-<h2>🗒️ Commit convention</h2>
+<h2>🗒️ 커밋 컨벤션</h2>
 <br>
 
 |Message|설명|
@@ -194,6 +217,3 @@
 |[Refactor]|코드 리팩토링|
 |[Test]|테스트 코드 추가|
 |[Etc] |이외 기타사항|
-
-
-
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -30,7 +30,7 @@
     "style-loader": "^3.3.2",
     "typescript": "^5.0.4",
     "webpack": "^5.81.0",
-    "webpack-cli": "^5.1.1",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.13.3"
   },
   "dependencies": {

diff --git a/client/public/github.png b/client/public/github.png