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

카카오 동의 #27

Merged
merged 51 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
501bb3c
Feat: Navbar 구현
marina-yhm Nov 6, 2023
f7189c1
Merge branch 'readyvery:test' into test
marina-yhm Nov 7, 2023
6ac68e2
Feat: Navbar 구현
marina-yhm Nov 7, 2023
c66abad
Merge pull request #5 from marina-yhm/test
marinesnow34 Nov 7, 2023
bc44cb6
Feat: Home화면 구현
marina-yhm Nov 7, 2023
b54708c
Merge pull request #6 from marina-yhm/test
marinesnow34 Nov 13, 2023
65c1f75
Feat: Header 기능구현
marina-yhm Nov 13, 2023
ca2e59b
Merge pull request #7 from marina-yhm/test
marinesnow34 Nov 13, 2023
4d96800
Design: 주문UI 추가
marina-yhm Nov 14, 2023
0f486fe
Fix: 사용하지 않는 코드 삭제
marina-yhm Nov 14, 2023
1280449
Merge branch 'readyvery:test' into test
marina-yhm Nov 17, 2023
0648a91
Design: 대기주문화면 디자인
marina-yhm Nov 17, 2023
12dd55d
Merge branch 'test' of https://github.com/marina-yhm/readyBusinessFro…
marina-yhm Nov 17, 2023
dafcd23
Style: 홈 화면 스타일 수정
hhbb0081 Nov 17, 2023
ef78a91
Feat: 재고관리 페이지 추가
hhbb0081 Nov 17, 2023
b85dd7b
Feat: 마이페이지 추가
hhbb0081 Nov 17, 2023
20894f1
Merge pull request #11 from marina-yhm/test
marinesnow34 Nov 17, 2023
aa9406c
Fix: 충돌 해결
hhbb0081 Nov 17, 2023
cbbb460
Merge pull request #12 from hhbb0081/test
marinesnow34 Nov 17, 2023
f38d6fa
Revert "Feat: 재고관리 & 마이페이지 추가"
marinesnow34 Nov 17, 2023
e53b8c6
Merge pull request #13 from readyvery/revert-12-test
hhbb0081 Nov 17, 2023
31cdb99
Feat: 재고관리 & 마이페이지 추가
hhbb0081 Nov 17, 2023
53170d4
Fix: end 오류 해결
hhbb0081 Nov 17, 2023
74668ca
Merge pull request #15 from hhbb0081/test
hhbb0081 Nov 17, 2023
67f6088
Feat: Home 대기오더 기능 구현
marina-yhm Nov 17, 2023
ef7ba4b
Feat: 매출관리 페이지 추가
hhbb0081 Nov 19, 2023
33ddbb6
Style: 드래그 방지 css 추가
hhbb0081 Nov 19, 2023
71523a4
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Nov 19, 2023
7c5bd6b
Merge pull request #17 from hhbb0081/test
hhbb0081 Nov 19, 2023
fd2f9a5
Merge branch 'test' of https://github.com/marina-yhm/readyBusinessFro…
marina-yhm Nov 20, 2023
9441df9
Fix: git error
marina-yhm Nov 20, 2023
22ba1c7
Fix: 안쓰는 코드 삭제
marina-yhm Nov 20, 2023
b724a58
Merge pull request #19 from marina-yhm/test
marinesnow34 Nov 20, 2023
b78f07b
Feat: auth추가
hhbb0081 Nov 23, 2023
92ff266
Styles: 스타일 수정
hhbb0081 Nov 23, 2023
0a0221a
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Nov 23, 2023
2e87c07
Fix: 에러 해결
hhbb0081 Nov 23, 2023
a079771
Merge pull request #21 from hhbb0081/test
hhbb0081 Nov 23, 2023
866252d
Refactor: Receipt 코드
marina-yhm Nov 23, 2023
ba83119
Merge branch 'test' into test
marina-yhm Nov 23, 2023
0f53914
Fix: 안쓰는 코드 주석
marina-yhm Nov 23, 2023
41bd905
Merge branch 'home' into test
marina-yhm Nov 23, 2023
4999b71
Fix: 안쓰는 코드 주석
marina-yhm Nov 23, 2023
b14ebc5
Merge branch 'home' into test
marina-yhm Nov 23, 2023
63b53cd
Feat: Home완성 및 Audio 구현
marina-yhm Nov 24, 2023
4bc7d38
Fix: 안쓰는 코드 주석
marina-yhm Nov 24, 2023
ca11d40
Fix: git error
marina-yhm Nov 24, 2023
d622a4c
Merge pull request #26 from marina-yhm/test
marinesnow34 Nov 24, 2023
0988f57
Config: s3 라이브러리 변경
marinesnow34 Nov 25, 2023
0daaf60
Config: env 수정
marinesnow34 Nov 25, 2023
5610f41
Config: s3 라이브러리 변경
marinesnow34 Nov 25, 2023
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
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ WDS_SOCKET_PORT=0
NODE_PATH=src/
REACT_APP_API_ROOT=http://localhost:8080
REACT_APP_HOME_URL=http://localhost:3000

REACT_APP_API_URL=http://readyvery.com/api/v1
REACT_APP_KAKAO_LOGIN=http://localhost:8080/oauth2/authorization/kakao
60 changes: 34 additions & 26 deletions .github/workflows/test_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,51 @@ jobs:

- name: Set .env from secrets
run: |
echo "PORT=${{ secrets.TEST_PORT }}" > .env
echo "WDS_SOCKET_PORT=0" >> .env
echo "NODE_PATH=src/" >> .env
echo "REACT_APP_API_ROOT=${{ secrets.TEST_REACT_APP_API_ROOT }}" >> .env
echo "REACT_APP_HOME_URL=${{ secrets.TEST_REACT_APP_HOME_URL }}" >> .env
echo "${{ secrets.TEST_ENV }}" > .env

- name: cat env file
run: cat .env

- name: Generate build # React Build
run: npm run build

- name: file copy
uses: actions/upload-artifact@v3
with:
name: build
path: build
deploy:
needs: build
runs-on: ubuntu-latest
steps:
- name: file download
uses: actions/download-artifact@v3
with:
name: build
path: build
# - name: file copy
# uses: actions/upload-artifact@v3
# with:
# name: build
# path: build
# deploy:
# needs: build
# runs-on: ubuntu-latest
# steps:
# - name: file download
# uses: actions/download-artifact@v3
# with:
# name: build
# path: build
# - name: Upload to Cloudflare
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
# AWS_DEFAULT_REGION: us-east-1
# BUCKET_NAME: ${{ secrets.CF_BUCKET_NAME }}
# ENDPOINT_URL: ${{ secrets.CF_ENDPOINT_URL }}
# run: |
# aws s3 sync build s3://$BUCKET_NAME/build_ceo \
# --endpoint-url $ENDPOINT_URL --delete \
# --exact-timestamps
- name: Upload to Cloudflare
uses: jakejarvis/[email protected]
with:
args: --delete --exact-timestamps
env:
AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-east-1
BUCKET_NAME: ${{ secrets.CF_BUCKET_NAME }}
ENDPOINT_URL: ${{ secrets.CF_ENDPOINT_URL }}
run: |
aws s3 sync build s3://$BUCKET_NAME/build_ceo \
--endpoint-url $ENDPOINT_URL --delete \
--exact-timestamps
AWS_S3_ENDPOINT: ${{ secrets.CF_ENDPOINT_URL }}
AWS_REGION: us-east-1
AWS_S3_BUCKET: ${{ secrets.CF_BUCKET_NAME }}
SOURCE_DIR: 'build'
DEST_DIR: 'build_ceo'

- name: SSH and deploy
uses: appleboy/[email protected]
Expand Down
Loading