Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [PR-release] #74

Closed
wants to merge 100 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
52e0af5
Create pull_request_template.md
useonglee Nov 19, 2023
48671b9
Create CODEOWNERS
useonglee Nov 19, 2023
ce86cf8
chore: [LINKER-6] 프로젝트 세팅 (#1)
useonglee Nov 27, 2023
05faee1
feat: [LINKER-8] 테스트 환경 구축 (#2)
useonglee Dec 1, 2023
b4edcf1
fix: [LINKER-14] 테스트 환경 버그 수정 (#3)
useonglee Dec 2, 2023
8476d5f
chore: [LINKER-16] docker통한 CD 구축 (#4)
danivelop Dec 2, 2023
13de7b0
chore: cd 동작 테스트를 위해 간단한 텍스트 추가 (#5)
danivelop Dec 2, 2023
72a42ab
chore: [LINKER-15] 로드밸런서 서버설정에 맞도록 도커 컨테이너의 외부 port를 3000번으로 변경 (#6)
danivelop Dec 6, 2023
7fd9ff3
feat: [LINKER-7] Github Action CI 보완 (#7)
useonglee Dec 14, 2023
bf3813a
fix: auto merge CI checkout 명령어 수정
useonglee Dec 14, 2023
35b316a
fix: auto merge CI checkout 브랜치 존재여부 확인 후 명령어 실행
useonglee Dec 14, 2023
fa36fc7
fix: auto-merge checkout -b 명령어 제거
useonglee Dec 14, 2023
453fc79
fix: auto-merge CI action event 수정
useonglee Dec 14, 2023
c179ce2
fix: auto-merge CI 수정
useonglee Dec 14, 2023
5b08000
feat: [LINKER-23] vanilla extract global style 설정 (#8)
JjungminLee Dec 14, 2023
749202d
feat: [LINKER-22] AWS S3 이미지 업로드 자동화 CI 추가 (#10)
useonglee Dec 16, 2023
459bbca
fix: dockerfile yarn workspace build error
useonglee Dec 17, 2023
7e473c9
feat: [LINKER-35] normalize css 추가 (#12)
useonglee Dec 17, 2023
791f221
feat: [LINKER-34] 불필요한 도커 이미지 제거 (#11)
useonglee Dec 19, 2023
b15d39e
feat:[LINKER-37] reset CSS 추가 (#14)
JjungminLee Dec 22, 2023
302e2e1
fix: [LINKER-38] 도커 이미지 충돌 해결 (#15)
useonglee Dec 22, 2023
9ae86cc
feat: [LINKER-39] 도커 이미지 용량 문제 해결 (#16)
useonglee Dec 22, 2023
8065950
feat: [LINKER-29] 프로필, Tab별 페이지 레이아웃 구조 및 GNB 기능 구현 (#13)
danivelop Dec 24, 2023
81ec92c
fix: docker build시 arm64 호환 에러발생하는 이슈 수정 (#17)
danivelop Dec 24, 2023
73fda43
feat: [LINKER-36] 디자인 시스템 적용 (w. typography, colors, font) (#18)
useonglee Dec 27, 2023
0153f55
feat: [LINKER-46] 헤더 구조변경 (#19)
danivelop Jan 2, 2024
263ca8a
fix: [LINKER-46] 리뷰반영 (#20)
danivelop Jan 2, 2024
c03baec
feat:[LINKER-61] 연락처탭 퍼블리싱 (#21)
JjungminLee Jan 3, 2024
e29b559
feat: [LINKER-42] List 공통 컴포넌트 추가 (#22)
useonglee Jan 3, 2024
15fa31c
Docker 메모리 최적화 작업 (#25)
danivelop Jan 6, 2024
f681e17
feat: [LINKER-62] Carousel 컴포넌트 구현 (#23)
danivelop Jan 6, 2024
99f9bf5
feat: [LINKER-41] 디자인 시스템 컬러 수정 + Layout 컴포넌트 추가 (#26)
useonglee Jan 11, 2024
e57822d
feat: [LINKER-65] Calendar 공통 컴포넌트 추가 (#24)
useonglee Jan 11, 2024
1c2d262
feat: [LINKER-68] Modal 컴포넌트 (#27)
useonglee Jan 12, 2024
3867cd5
fix: [LINKER-72] Calender 컴포넌트 주단위 기능 구현 (#28)
useonglee Jan 12, 2024
97506c9
chore: yarn install
useonglee Jan 12, 2024
063b25e
feat:타임라인 컴포넌트 개발
JjungminLee Jan 13, 2024
621a4cb
feat:타임라인 컴포넌트 개발
JjungminLee Jan 13, 2024
52beab6
fix:pr코멘트 기반 수정
JjungminLee Jan 14, 2024
3b084b7
fix:env파일 안보이게 수정
JjungminLee Jan 14, 2024
07e84e1
fix:mock data수정
JjungminLee Jan 17, 2024
cd7b6f6
feat: [LINKER-73] msw Mock Server 구축 + ky 인터페이스 개선 (#31)
useonglee Jan 17, 2024
a1859b9
Merge branch 'develop' into feat/LINKER-70
JjungminLee Jan 17, 2024
903d985
Merge pull request #30 from YAPP-Github/feat/LINKER-70
JjungminLee Jan 17, 2024
8ae2663
fix: merge conflict
JjungminLee Jan 17, 2024
67ef6f0
feat: [LINKER-63] Chip 디자인 시스템 컴포넌트 추가 (#33)
useonglee Jan 17, 2024
1ddd469
Merge branch 'develop' of https://github.com/YAPP-Github/23rd-Web-Tea…
JjungminLee Jan 18, 2024
a07f484
fix: [LINKER-84] dev:mock 실행 명령어 오류 해결 (#35)
useonglee Jan 18, 2024
78d2446
Merge branch 'develop' of https://github.com/YAPP-Github/23rd-Web-Tea…
JjungminLee Jan 18, 2024
2f52469
feat: [LINKER-45] 다가오는 일정 확인하기 카드 구현 (#29)
danivelop Jan 18, 2024
53df910
feat: 검색 공통 컴포넌트 개발
JjungminLee Jan 19, 2024
6115706
feat: 즐겨찾기 퍼블리싱 추가
JjungminLee Jan 19, 2024
a705538
fix: react-hook-form controller수정
JjungminLee Jan 19, 2024
602f05d
Merge branch 'develop' of https://github.com/YAPP-Github/23rd-Web-Tea…
JjungminLee Jan 19, 2024
fdbe4ed
fix: msw+ky연결 완
JjungminLee Jan 19, 2024
80a7ce8
fix: package.json 돌려놓기
JjungminLee Jan 19, 2024
f09785e
fix: yarn.lock 문제 해결
JjungminLee Jan 19, 2024
598bcd1
chore: eslint와 prettier간 설정 충돌로 인해 prettier가 적용 안되는 문제 수정 (#37)
danivelop Jan 19, 2024
87f8e24
Merge branch 'develop' of https://github.com/YAPP-Github/23rd-Web-Tea…
JjungminLee Jan 20, 2024
a585fdf
fix: 코멘트 css 수정사항 반영
JjungminLee Jan 20, 2024
6651bae
fix: contact 폴더구조 변경
JjungminLee Jan 21, 2024
9ae546a
Merge pull request #36 from YAPP-Github/feat/LINEKR-71
JjungminLee Jan 21, 2024
89144ab
feat: [LINKER-95] 디자인 시스템 최신화 (#41)
useonglee Jan 23, 2024
4f24dff
feat: [LINKER-75] 대화 주제 추천 받기 (#38)
danivelop Jan 23, 2024
211b53e
feat: [LINKER-81] FAB 버튼 추가 (#40)
useonglee Jan 24, 2024
11755f8
fix: [LINKER-94] 타임라인 아이템 바뀐 css반영 (#42)
JjungminLee Jan 27, 2024
0979e5a
feat: [LINKER-88] 지난 일정 기록카드 구현 (#39)
danivelop Jan 28, 2024
370d4ec
feat: [LINKER-33] 홈화면 카카오로그인 추가 (#43)
useonglee Jan 30, 2024
cfd33b2
chore: 컨테이너 실행시 기존에 잇던 모든 컨테이너, 이미지 삭제하도록 수정 (#46)
danivelop Feb 1, 2024
4d76a4a
chore: docker명령어에 sudo 권한 부여 (#47)
danivelop Feb 1, 2024
1e0a3a5
fix: [LINKER-103] Profile 컴포넌트 size prop 추가 및 imageUrl prop 이름 수정 (#48)
useonglee Feb 2, 2024
2fcef66
feat: [LINKER-101] 토큰 재발급 기능 구현 (#45)
useonglee Feb 3, 2024
65be882
feat: [LINKER-98] 일정상세 화면 (#44)
JjungminLee Feb 4, 2024
e5f07b7
feat: [LINKER-104] 로그인 > 마이 프로필 헤더 구현 (#50)
useonglee Feb 5, 2024
171db5e
fix: [LINKER-108] 새로고침 시 > 서버 html만으로 화면 그리도록 수정 (#51)
useonglee Feb 6, 2024
35a053d
feat: [LINKER-110] 프로필 헤더 수정 (#52)
useonglee Feb 11, 2024
2b92d11
feat: [LINKER-112] BottomSheet 컴포넌트 추가 (#54)
useonglee Feb 14, 2024
3f9b74a
feat: [LINKER-106] Dropdown 컴포넌트 개발 (#53)
JjungminLee Feb 14, 2024
8ae7af2
feat: [LINKER-114] Input, TextArea 컴포넌트 추가 (#57)
useonglee Feb 20, 2024
ff45e0f
feat: [LINKER-92] 연락처 검색화면 개발 (#56)
JjungminLee Feb 20, 2024
ba69b9f
feat: [LINKER-97] 트렌드 핫 이슈 구현 (#49)
danivelop Feb 21, 2024
01653c7
feat: [LINKER-109] 대화주제 추천받기 상세 페이지 구현 (#55)
danivelop Feb 21, 2024
caf4702
feat: [LINKER-116] 지인페이지 프로필 개발 (#58)
JjungminLee Feb 22, 2024
9a12204
feat: [LINKER-117] 지인페이지 타임라인 개발 (#60)
JjungminLee Feb 22, 2024
9f41a83
feat: [LINKER-124] 연락처 등록 기능 구현 (#61)
useonglee Feb 22, 2024
d115136
fix: [LINKER-125] 연락처 등록 바텀싯 높이 버그 수정 (#62)
useonglee Feb 22, 2024
017f3af
feat: [LINKER-129] 에러 페이지 적용 (#64)
useonglee Feb 22, 2024
1daba1c
feat: [LINKER-127] 로그인 모달 컨텐츠 추가 (#63)
useonglee Feb 22, 2024
b28ddf1
fix: accessToken 없는 경우에만 ContactBanner 뜨도록 수정
useonglee Feb 22, 2024
ade4793
fix: next router -> navigation 수정
useonglee Feb 22, 2024
8c51803
feat: [LINKER-118] 트렌드 핫이슈 상세페이지 구현 (#59)
danivelop Feb 22, 2024
d5b1ebb
feat: [LINKERT-132] build 에러 픽스 (#66)
danivelop Feb 22, 2024
24f7b87
fix: 연락처 검색화면 css수정 (#65)
JjungminLee Feb 22, 2024
7915a07
feat: [LINKER-131] 타임라인 데이터 null일때 예외처리 (#67)
JjungminLee Feb 23, 2024
3c9e536
feat: [LINKER-80] 일정 등록 기능 구현 (#68)
useonglee Feb 23, 2024
6c792f6
pem 파일명 수정
useonglee Feb 23, 2024
5aa553e
fix: [LINKER-137] 바텀싯 로컬 서버 에러 수정 (#69)
useonglee Feb 23, 2024
d2823b6
chore: ssh 접속할 경우 디버그 모드 켜기
useonglee Feb 23, 2024
72ebbdd
feat: [LINKER-135] 캘린더에 데이터가 없을때 에러페이지 (#70)
JjungminLee Feb 23, 2024
9e13fdf
fix: [LINKER-142] Tab 컴포넌트 수정 (#71)
useonglee Feb 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## docker ignore

node_modules
.next
.yarn
.storybook
**/*.stories.*
**/*.spec.*
.git
.gitignore
.github
.dockerignore
scripts
Dockerfile
18 changes: 18 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
**/_next
**/.next
**/next.config.js
**/config.js
**/next-env.d.ts
**/jest.config.js
**/jest.setup.js
**/.yarn
**/dist
**/out
**/scripts
**/bin
**/node_modules
**/__mocks__
**/__tests__
**/public/mockServiceWorker.js
.eslintrc.js
.pnp.*
31 changes: 31 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const INTERNAL_GROUPS = [
'components',
'constants',
'contexts',
'hooks',
'pages',
'store',
'types',
'utils',
];

module.exports = {
root: true,
env: {
browser: true,
node: true,
},
globals: {
JSX: 'readonly',
},
extends: ['@linker/eslint-config/react'],
settings: {
next: {
rootDir: ['services/*/'],
},
react: {
version: 'detect',
},
'import/internal-regex': `@(${INTERNAL_GROUPS.join('|')})`,
},
};
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @useonglee @danivelop @JjungminLee
32 changes: 32 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## 작업 내용

<!-- 작업한 내용을 적어주세요 -->

-

<br />

## 반영 화면

<!-- 작업 내용이 반영된 화면을 붙여넣어주세요 -->

<!--

| **AS-IS** | **TO-BE** |
|:---:|:---:|
| x | y |

영상
<video src="" style="width:25%;" />

이미지
<img src="" style="width:25%;" />

-->


<br />

## 기타

- n/a
36 changes: 36 additions & 0 deletions .github/workflows/auto-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Auto Merge on Approval

on:
pull_request_review:
types:
- submitted

jobs:
auto_merge:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Check if approved
id: check_approval
run: |
if [[ "${{ github.event.review.state }}" == "approved" ]]; then
echo "::set-output name=approved::true"
else
echo "::set-output name=approved::false"
fi
shell: bash

- name: Setup GitHub CLI
if: steps.check_approval.outputs.approved == 'true'
run: |
gh auth login --with-token <<< "${{ secrets.GH_TOKEN }}"
shell: bash

- name: Squash merge if approved
if: steps.check_approval.outputs.approved == 'true'
run: |
gh pr merge ${{ github.event.pull_request.number }} --squash --auto
shell: bash
47 changes: 47 additions & 0 deletions .github/workflows/chromatic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Chromatic Deployment

on:
pull_request:
branches:
- develop
types: [opened, reopened]
paths:
- '**.stories.tsx'

jobs:
chromatic:
runs-on: ubuntu-latest
steps:
- name: Checkout Storybook
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Node V2
uses: actions/setup-node@v2
with:
node-version: '18.17.0'
cache: 'yarn'

- name: Install dependencies
run: yarn install

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Publish to Chromatic
id: chromatic
uses: chromaui/action@v1
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
buildScriptName: build-storybook
onlyChanged: true

- name: Create comment PR
uses: thollander/actions-comment-pull-request@v1
if: ${{ github.event_name == 'pull_request' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
message: '🚀 storybook: ${{ steps.chromatic.outputs.storybookUrl }}'
83 changes: 83 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Deploy to Amazon EC2

on:
push:
branches:
- develop

concurrency:
group: deploy-${{ github.ref }}
cancel-in-progress: true

env:
AWS_REGION: ap-northeast-2

jobs:
cleanup:
runs-on: ubuntu-latest

steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Cleanup Unused ECR Images
id: cleanup-images
env:
ECR_REPOSITORY: linker
IMAGE_TAG: ${{ github.sha }}
run: |
aws ecr batch-delete-image --repository-name $ECR_REPOSITORY --image-ids imageTag=$IMAGE_TAG

deploy:
runs-on: ubuntu-latest
environment: production

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Build, tag, and push image to Amazon ECR
id: build-image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
ECR_REPOSITORY: linker
IMAGE_TAG: ${{ github.sha }}
run: |
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
docker rmi $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG

- name: Deploy to EC2
env:
IMAGE_TAG: ${{ github.sha }}
EC2_IP: ${{ secrets.EC2_IP_ADDRESS }}
run: |
echo "${{ secrets.EC2_SSH_PRIVATE_KEY }}" > private_key.pem
chmod 600 private_key.pem
ssh -v -i private_key.pem -o StrictHostKeyChecking=no ubuntu@$EC2_IP "
aws ecr get-login-password --region ap-northeast-2 |
sudo docker login --username AWS --password-stdin 903755389667.dkr.ecr.ap-northeast-2.amazonaws.com/linker &&
sudo docker container rm -f $(sudo docker container ls -a --quiet)
sudo docker rmi $(sudo docker images -q) -f
sudo docker image pull 903755389667.dkr.ecr.ap-northeast-2.amazonaws.com/linker:$IMAGE_TAG &&
sudo docker container run --name linker -d -p 3000:3000 903755389667.dkr.ecr.ap-northeast-2.amazonaws.com/linker:$IMAGE_TAG"
55 changes: 55 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: PR

on:
pull_request:
branches:
- develop

concurrency:
group: pr-${{ github.ref }}-${{ github.actor }}
cancel-in-progress: true

env:
COMMITS: ${{ github.event.pull_request.commits }}
NODE_OPTIONS: '--max-old-space-size=8192'

jobs:
typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Read .nvmrc
run: echo ::set-output name=NVMRC::$(cat .nvmrc)
id: nvm

- name: Set up Node V2
uses: actions/setup-node@v2
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

- run: corepack enable
- run: yarn install

- name: Type Check
run: yarn workspace web tsc

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Read .nvmrc
run: echo ::set-output name=NVMRC::$(cat .nvmrc)
id: nvm

- name: Set up Node V2
uses: actions/setup-node@v2
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

- run: corepack enable
- run: yarn install

- name: Test
run: yarn workspace web test
28 changes: 28 additions & 0 deletions .github/workflows/ticket-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Ticket Check

on:
pull_request:
types: [opened, synchronize, edited, reopened]

concurrency:
group: ticket-check-${{ github.ref }}-${{ github.actor }}
cancel-in-progress: true

jobs:
ticketcheck:
if: ${{ github.head_ref != 'develop' }}
name: Ticket Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Set up Node V2
uses: actions/setup-node@v2
with:
node-version: '18.17.0'
- run: corepack enable
- run: yarn install
- run: yarn ts-node-script -T ./scripts/issue-ticket.ts ${{ toJSON(github.event.pull_request.title) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31 changes: 31 additions & 0 deletions .github/workflows/upload-to-s3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Upload images to S3

on:
push:
branches:
- develop
paths:
- 'packages/assets/**'

env:
AWS_REGION: ap-northeast-2

jobs:
upload:
runs-on: ubuntu-latest
environment: production

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Upload to S3
run: |
aws s3 sync ./packages/assets s3://static.im-linker.com
Loading
Loading