From 349047464e8e984874cac6f1197d66f8c53390b3 Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 00:04:38 +0900 Subject: [PATCH 1/7] =?UTF-8?q?220105=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20?= =?UTF-8?q?=EC=A0=84=EB=9E=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0bbc284..0070e07 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,29 @@ ## 커밋 컨벤션 ## 브랜치 전략 -- [ ] git-flow (공부하기) -- [ ] github-flow +- [git 브랜치 전략에 대해서](https://tecoble.techcourse.co.kr/post/2021-07-15-git-branch/) +- [ ] Git-flow +- [ ] Github-flow +- [X] Gitlab-flow + +### 1. feature 브랜치 +- 모든 기능은 feature 브랜치에서 진행됨 +- master 브랜치에서 나와 master 브랜치로 머지됨 +- 기능이 완료되면 merge request 보냄 +### 2. master 브랜치 +- git flow의 develop 브랜치와 같음 +- feature브랜치에서 병합된 기능을 test함 +- 전체적인 테스트가 진행되어 기능보장이 완료되면 production 브랜치로 머지함 +### 3. production 브랜치 +- 배포 브랜치 + +### 각 브랜치 기능 +- feature/camera: 카메라로 사진 입력받는 기능 +- feature/result: 유사도 분석 결과 보여주는 기능 +- feature/networkmap: 네트워크맵을 통해 사진유포 트윗의 리트윗/좋아요 계정을 보여주는 기능 +- feature/report: 센터와 트위터에 계정을 신고하는 기능 ## 스타일링 - [X] Styled-components -- [ ] Material-ui +- [X] Material-ui (신고 계정 아바타) - [ ] CSS module (미확정) From ef5f50f32485bc6fa120dec18d372d850462969b Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 00:15:35 +0900 Subject: [PATCH 2/7] =?UTF-8?q?PR=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..a2f6d3f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,9 @@ +## 개요 +- Issue 번호를 적어주세요. +- 내용을 적어주세요. + +## 작업사항 +- 내용을 적어주세요. + +## 변경로직(optional) +- 내용을 적어주세요. From b3f35fce4e3777313a3c9d12d845a7f57d39c52e Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 00:18:51 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..b94817c --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,2 @@ +## 버그 설명 +- A clear and concise description of what the bug is. From 4241f620972cbcdf85ac9d033fe01e3e26d8eaac Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 00:31:13 +0900 Subject: [PATCH 4/7] =?UTF-8?q?PR=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..63d02a1 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +# PR + +## 개요 +- Issue 번호를 적어주세요. +- 내용을 적어주세요. + +## 내용 +- 내용 명: 내용을 작성해주세요. + +## 체크리스트 +- [ ] 체크리스트를 작성합니다. From 5ef8d17f842a8084b31d22f0f9d16ba1af05c241 Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 00:42:27 +0900 Subject: [PATCH 5/7] Delete .github directory --- .github/ISSUE_TEMPLATE.md | 2 -- .github/PULL_REQUEST_TEMPLATE.md | 9 --------- 2 files changed, 11 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index b94817c..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,2 +0,0 @@ -## 버그 설명 -- A clear and concise description of what the bug is. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index a2f6d3f..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,9 +0,0 @@ -## 개요 -- Issue 번호를 적어주세요. -- 내용을 적어주세요. - -## 작업사항 -- 내용을 적어주세요. - -## 변경로직(optional) -- 내용을 적어주세요. From cad8f56ca7ce8a5cff5240b9c85cf26908f1756c Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Wed, 5 Jan 2022 23:56:12 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..96b39df --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +## 📑 이슈 내용 +- 이슈 내용 요약 설명 + +## 📝 상세 내용 +- 이슈 내용 구현 관련 상세 내용 작성 + +## ✔ 체크리스트 +- [ ] TODO A + +## 📍 레퍼런스 +- ex. 카카오 맵 api, keyworkSearch 함수 From ed55159ed28e698c13b477203eca781082167b93 Mon Sep 17 00:00:00 2001 From: hyosin Jang Date: Sun, 9 Jan 2022 06:30:24 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=B0=EC=83=B7=20?= =?UTF-8?q?=EB=84=A3=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/feature_request.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 96b39df..53a4391 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -18,3 +18,5 @@ assignees: '' ## 📍 레퍼런스 - ex. 카카오 맵 api, keyworkSearch 함수 + +## 📷 스크린샷