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

ci: main 배포 #625

Merged
merged 37 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9eb3d3e
fix: 사용 불가능 카메라 목록에서 삭제 등
jhj9109 May 5, 2024
94c2804
Merge pull request #611 from jhj9109/610-바코드리더-사용불가디바이스-제거
nyj001012 May 7, 2024
2033102
Chore 인포메이션 집현전 위치 업데이트 (#613)
jhj9109 Jul 3, 2024
0ab61ed
ci: semantic PR 기준 완화
scarf005 Jul 3, 2024
68581cc
Merge pull request #614 from jiphyeonjeon-42/scarf005-patch-1
chanhihi Jul 3, 2024
2a1079f
WIP
hyeunkim42 Sep 14, 2024
6655d5e
wip: Rending Confirm에서 사서가 자신의 책을 대출할 때 4권까지 대출 허용
hyeunkim42 Sep 14, 2024
426c95f
fix: 책을 2권 초과하여 선택하는 경우 삭제 대상만 리스트에 남아있는 버그 수정
hyeunkim42 Sep 19, 2024
1c10729
wip: 임시로 4권 선택 가능하도록 수정해둔 상태
hyeunkim42 Sep 19, 2024
6ea9ec7
fix: 사서인지 확인하는 변수를 prop이 아닌 userAtom으로 판단하도록 변경
hyeunkim42 Sep 19, 2024
afbbcbe
fix: 사서 본인의 대출인지 확인하는 방식을 prop에서 Atom으로 변경
hyeunkim42 Sep 19, 2024
b612710
feat: 대출 유저 선택 후, 사서라면 사서 표시 추가
mixsung Sep 20, 2024
0b344a3
feat: 사서 본인의 대출 시, 4권까지 가능하도록 lendingLimit 설정
mixsung Sep 20, 2024
a24613f
feat: 사서 본인의 대출에 따라 바뀌는 대출현황(/2권 -> /4권)
mixsung Sep 20, 2024
8e0e2ee
refactor: 대출확인모달의 선택 도서 간 경계 및 비고란 명확한 표시 추가
mixsung Sep 20, 2024
db632ed
fix: penalty 표시에 괄호 안닫히던 bug 수정
hyeunkim42 Sep 20, 2024
e56f1ff
fix: 책 비고 작성시 2~4번째 책 비고란 묶여있던 거 각각 작성되도록 수정
hyeunkim42 Sep 21, 2024
5de1deb
fix: 이전 커밋 적용 된 뒤 "대출하기" 버튼 안눌리던 현상 수정
hyeunkim42 Sep 21, 2024
314ccc3
fix: 유저의 role을 enum으로 변경 후 적용
mixsung Sep 23, 2024
ed99a11
fix: Rent 비즈니스 로직 변경(대출권수)을 JSDoc으로 명시
mixsung Sep 23, 2024
702403f
fix: lendingLimit 함수화 및 constant 적용
mixsung Sep 23, 2024
c53f6fe
fix: 변수 이름 수정, lending limit 함수 사용
hyeunkim42 Sep 23, 2024
bd2e37b
fix: lendingLimit 함수화 적용
mixsung Sep 23, 2024
516754d
chore: using optional chaning
YeonSeong-Lee Sep 27, 2024
d499d5a
Merge pull request #620 from jiphyeonjeon-42/619-사서-대출권수-4권으로-변경
YeonSeong-Lee Sep 27, 2024
224e802
build: install react-helmet-async
YeonSeong-Lee Sep 29, 2024
a9bb590
feat: 기본적인 meta태그 설정
YeonSeong-Lee Sep 29, 2024
de4c5f4
feat: 책 상세페이지 meta tag 설정
YeonSeong-Lee Sep 29, 2024
efbc2e8
build: install puppeteer
YeonSeong-Lee Sep 29, 2024
20cbebe
chore: 오픈그래프 문구 수정
YeonSeong-Lee Sep 30, 2024
7775c08
build: 오픈그래프 테그를 위해 prerender 설정
YeonSeong-Lee Sep 30, 2024
daf4464
chore: update pnpm-lock.yaml
YeonSeong-Lee Oct 2, 2024
3834f5f
Merge pull request #621 from jiphyeonjeon-42/618-책-링크-공유시-해당책에-이미지와-설…
YeonSeong-Lee Oct 3, 2024
0005166
ci: 자동배포용 스크립트
YeonSeong-Lee Oct 3, 2024
9f426fa
Merge pull request #624 from jiphyeonjeon-42/623-ci-자동배포-기능
YeonSeong-Lee Oct 3, 2024
ef85bfe
ci: install chrome for prerender
YeonSeong-Lee Oct 3, 2024
e8620b5
fix: install chrome
YeonSeong-Lee Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
titleAndCommits: true
titleOnly: true
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,9 @@ jobs:
- name: Install Dependencies
run: pnpm install

- name : install chrome for prerender
run: |
npx puppeteer browsers install chrome

- name: Build
run: pnpm build
28 changes: 23 additions & 5 deletions .github/workflows/deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,30 @@ jobs:
- name: Install Dependencies
run: pnpm install

- name : install chrome for prerender
run: |
npx puppeteer browsers install chrome
- name: Build
run: pnpm build

- name: Deploy
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- 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: ap-northeast-2

- name: Upload to AWS S3
run: |
aws deploy push \
--application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
--s3-location s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \
--source .

- name: Deploy to AWS EC2 from S3
run: |
aws s3 sync ./build s3://42library.kr --region ap-northeast-2 --delete
aws deploy create-deployment \
--application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
--deployment-config-name CodeDeployDefault.AllAtOnce \
--deployment-group-name ${{ env.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
--s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip i
24 changes: 24 additions & 0 deletions appspec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version: 0.0
os: linux

files:
- source: /
destination: /home/ubuntu/frontend
overwrite: true
file_exists_behavior: OVERWRITE

permissions:
- object: /
pattern: "**"
owner: ubuntu
group: ubuntu

hooks:
AfterInstall:
- location: scripts/stop.sh
timeout: 60
runas: ubuntu
ApplicationStart:
- location: scripts/start.sh
timeout: 120
runas: ubuntu
2 changes: 0 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, minimum-scale=0.2, maximum-scale=1.0" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="모두가 함께 만들어가는 42서울의 도서관 '집현전'입니다." />
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">

<title>집현전</title>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300;400;700&display=swap" rel="stylesheet" />
<link rel="/manifest" href="/manifest.json" />
</head>
Expand Down
Loading
Loading