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.

Sign up for GitHub

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

Jump to bottom

[TEAM#6] Kiosk Project 2주 차 PR #24

Open
wants to merge 134 commits into
base: team-06
Choose a base branch
from
Open

[TEAM#6] Kiosk Project 2주 차 PR #24

wants to merge 134 commits into from

Conversation

pie2457
Copy link

@pie2457 pie2457 commented Jun 30, 2023 •
edited
Loading

📌  작업 기간

2023.06.26 ~ 2023.06.30

데모영상

demo.mov

🧑‍💻 Front - End

📌  작업 내용

  • 전체구조 리팩토링
  • 디자인 새로 작업
  • API endPoint연동
  • 영수증 UI
  • backend와 같이 빌드 한거 배포

👩‍💻 Back - End

📌  작업한 내용

  • API 작업 마무리
  • 인프라 구조 작업 마무리
  • 배포

✔️ 백엔드 배포 환경 구축

  • Github Actions을 통한 무중단 배포

✔️ 문서화

Kakamotobi and others added 30 commits June 19, 2023 15:13
@Kakamotobi
Init project
31c1831
@Kakamotobi
Add project ground rules
a4059c6
@Kakamotobi
chore: FE 프로젝트 생성
aff448b
@Sumin-Kim-dev
be-feat : init
5b07fcc
@Kakamotobi
docs: git branch 컨벤션 추가
df41f0f
@Sumin-Kim-dev
#5 feat : Entity 생성
54b66a0
@Kakamotobi
#6 chore: Prettier, ESLint 충돌 해결
03da6fd
@sudago
codesquad-members-2023#1 feat: Update README.md
f422faa 
update branch convention
@sudago
#4 feat : schema.sql 작성 및 DB 설정
4739032 
properties 에서 yml로 확장자 변경.
build.gradle 에 mysql 의존성 추가, 
varchar(200)은 varchar(45)로 수정,
각 테이블의 id는 중복 prefix 제외.
@Sumin-Kim-dev
#5 feat : pk id로 통일, Sales.date 타입 변경
df41929
@sudago
Merge pull request #10 from kiosk-max-06/feature#5
6e390f6 
#5 feat : Entity 생성
@Sumin-Kim-dev
Merge pull request #11 from kiosk-max-06/feature#4
01b3fa6 
#4 feat : schema.sql 작성 및 DB 설정
@pie2457
#13 feat : OrderController, OrderRepository, OrderService 뼈대 작업
f88e9b9
@sudago
#4 feat : 스키마 수정
34ce958 
각 id에 auto_increment 추가
@sudago
#4 fix : 스키마 수정
d78a987 
각 id에 auto_increment 추가
@sudago
Merge remote-tracking branch 'origin/feature#4' into feature#4
9e47691
@sudago @Kakamotobi
#4 feat : 스키마 수정
f117dde 
각 id에 auto_increment 추가
@Kakamotobi @saejinpark
#7 design: Tabs 컴포넌트 구현
bee3969
@Kakamotobi @saejinpark
#7 design: Panel 컴포넌트 구현
2941397
@Kakamotobi @saejinpark
#7 design: Tabs UI 완료 및 mock data 설정
0de2be8 
- 추후 수정 가능.
@Kakamotobi @saejinpark
#7 style: import 순서 수정
eb8d391
@JJONSOO
"test"
71e83aa
@JJONSOO
feat : main.yml
cc3c551
@JJONSOO
Github Action dev branch 에서 실행됨?
5e9d940
@JJONSOO
Github Action dev branch 에서 실행됨?
c1233ca
@JJONSOO
Github Action dev branch
a213673
@JJONSOO
Github Action dev branch 에서 실행됨?
017d7cf
@JJONSOO
Github Action dev branch 에서 실행됨?
0456cbd
@JJONSOO
Merge pull request #18 from JJONSOO/dev
a19761c 
Dev
@JJONSOO
Revert "Dev"
760ba17
JJONSOO and others added 16 commits June 29, 2023 15:35
@JJONSOO
#45 chore : CORS ProxyBeansMethod 삭제
6c49d06
@JJONSOO
Merge pull request #49 from kiosk-max-06/feature#45
5657e23 
#45 chore : CORS ProxyBeansMethod 삭제
@JJONSOO
#45 chore : MenuController ResponseEntity 수정
c63ebf9
@JJONSOO
Merge pull request #50 from kiosk-max-06/feature#45
fb6acab 
#45 chore : MenuController ResponseEntity 수정
@saejinpark
Update README.md
6d220ad
@JJONSOO
#45 chore : localhost:3000먼 열어두도록 수정
321d705
@JJONSOO
Merge pull request #51 from kiosk-max-06/feature#45
0f14ff1 
#45 chore : localhost:3000먼 열어두도록 수정
@saejinpark
feat: cart 추가 삭제
6665510
@Kakamotobi
#52 design: Modal form 및 Cart 디자인 수정
0a207c3 
- IBM Font 추가
@Kakamotobi
#53 feat: Receipt 구현
436ef49
@saejinpark
임시커밋
6998a3d
@saejinpark
Merge branch 'frontend' of https://github.com/kiosk-max-06/kiosk-max …
9d44da0 
…into frontend
@saejinpark
Update README.md
2ab3b2e
@Kakamotobi
fix: paymentAmount을 receivedAmount으로 변경
20064d7
@Kakamotobi
Merge pull request #55 from kiosk-max-06/frontend
b0a627d 
[FE] 배포
@JJONSOO
Merge pull request #57 from kiosk-max-06/backend
6c32f4c 
[BE] 배포
namse
namse approved these changes Jun 30, 2023
View reviewed changes
Copy link

@namse namse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fe 리뷰 끝낫습니다~ BE 끝나면 머지하세용~

frontend/src/App.tsx Show resolved Hide resolved
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
@jsh3418
메뉴 담기 모달 추가 기능 구현 (#27)
0f76d78 
* feat #24: 담기 클릭 시 장바구니 상태에 메뉴와 옵션을 추가 기능 구현

* feat #24: 담기 버튼 스타일 구현

* feat #24: 닫기 버튼 스타일 구현

* refactor #24: 모달 닫기 함수명 수정

* fix #24: 담기 모달 옵션 렌더링 버그 수정

- 담기 모달 열었을 때 옵션 선택되어 있는 것처럼 보이던 현상 수정

* feat #24: 담기 버튼 클릭 시 모달 닫힘 기능 구현
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
[#24] feat: 공통 응답 dto 설정
73ed7e1
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
[#24] feat: 코드 레이어 생성
7e73e51
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
@daewon-ko
[#24] feat: 상품목록조회 기능 구현
e42e8cf
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
@tjdqls1200
[#24] test: 상품 목록 조회 컨트롤러 테스트 작성
89562bf
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
@tjdqls1200
[#24] chore: 리포지토리 코드 줄바꿈 추가
b683628
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
[#24] test: 상품 목록 조회에 대한 test code 작성
38800ef
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
[#24] fix: sales log가 없을 때도 상품 목록 출력하도록 수정
f508d98
javaoracle pushed a commit that referenced this pull request Jul 5, 2023
[#24] fix: ProductControllerTest 에서 @WebMvcTest가 ProductController로 특…
7a3c781 
…정하도록 변경
@namse
Copy link

namse commented Jul 5, 2023

conflict 수정해주세요~

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@namse namse namse approved these changes

Assignees
No one assigned
Labels
review-BE review-FE
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pie2457 @namse @Kakamotobi @Sumin-Kim-dev @sudago @JJONSOO @saejinpark