Code

Develop branch#21

Code

Open

UCLABgown wants to merge 134 commits intomainprgrms-be-devcourse/NBE3-4-1-16Team:mainfrom develop-branchprgrms-be-devcourse/NBE3-4-1-16Team:develop-branchCopy head branch name to clipboard

+29,292-309

Commits

Commits on Jan 14, 2025

• test

  Show description for 57cb524
  UCLABgown

  committed
  57cb524

  Copy full SHA for 57cb524

Commits on Jan 15, 2025

• create product entity

  

  solji-choi

  authored and

  UCLABgown

  committed
  427cae5

  Copy full SHA for 427cae5

• Merge branch 'develop-branch' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into develop-branch

  UCLABgown

  committed
  54c2c9d

  Copy full SHA for 54c2c9d

• test

  UCLABgown

  committed
  27afa96

  Copy full SHA for 27afa96

• 컨트롤러 레포

  UCLABgown

  committed
  7f97e28

  Copy full SHA for 7f97e28

• BaseInitData

  solji-choi

  committed
  f9e43ae

  Copy full SHA for f9e43ae

• test

  UCLABgown

  committed
  2819c3c

  Copy full SHA for 2819c3c

• create product controller test

  solji-choi

  committed
  5de78a6

  Copy full SHA for 5de78a6

• feat: Update BaseInitData for initialization improvements

  HSH02

  committed
  69b4064

  Copy full SHA for 69b4064

• chore(Product & initData) : fetch Product and update BaseInitData

  HSH02

  committed
  8442dae

  Copy full SHA for 8442dae

• chore(order) : chanage package and InitData

  HSH02

  committed
  06c5b4e

  Copy full SHA for 06c5b4e

• 상품수정 / 상품수정 테스트 케이스 추가 수정

  UCLABgown

  committed
  5707ee8

  Copy full SHA for 5707ee8

• Merge branch 'develop-branch' into gown

  Show description for 262939d
  UCLABgown

  committed
  262939d

  Copy full SHA for 262939d

• 이상한 글자 삭제

  UCLABgown

  committed
  79428e9

  Copy full SHA for 79428e9

• chore(order): initdata & swagger update

  HSH02

  committed
  ca62a14

  Copy full SHA for ca62a14

• create items, create & items test case

  solji-choi

  committed
  8bac6fe

  Copy full SHA for 8bac6fe

• Merge pull request #10 from HSH02/worker-han

  Show description for 14b638c
  HSH02

  authored
  14b638c

  Copy full SHA for 14b638c

• feat: modified ApiResponse and OrderController response handling

  Show description for 52fd05e
  HSH02

  committed
  52fd05e

  Copy full SHA for 52fd05e

• Merge pull request #11 from HSH02/worker-han

  Show description for d638dad
  HSH02

  authored
  d638dad

  Copy full SHA for d638dad

• feat: 초기화 데이터 로직 및 주석 추가

  HSH02

  committed
  7f7bad0

  Copy full SHA for 7f7bad0

• Merge pull request #12 from HSH02/worker-han

  Show description for 83ed76f
  HSH02

  authored
  83ed76f

  Copy full SHA for 83ed76f

• chore(order): create 메서드에서 order 가 아닌 OrderResponseDTO을 반환하게 수정

  HSH02

  committed
  7722e10

  Copy full SHA for 7722e10

• chore(order): create 메서드에서 order 가 아닌 OrderResponseDTO을 반환하게 수정

  HSH02

  committed
  127ea89

  Copy full SHA for 127ea89

• product item, delete

  solji-choi

  committed
  a910f22

  Copy full SHA for a910f22

• refactoring, test case 추가

  solji-choi

  committed
  ea4bdfb

  Copy full SHA for ea4bdfb

• test: 주문 통합 테스트 작성

  

  이현준

  authored and

  이현준

  committed
  c30884d

  Copy full SHA for c30884d

• test: 주문 통합 테스트 작성

  

  이현준

  authored and

  이현준

  committed
  54105be

  Copy full SHA for 54105be

Commits on Jan 16, 2025

• Merge branch 'develop-branch' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into worker-han

  HSH02

  committed
  0a20c58

  Copy full SHA for 0a20c58

• feat(order): 스케줄러 기능 추가 및 Entity 어노테이션 수정

  HSH02

  committed
  a79e644

  Copy full SHA for a79e644

• Merge branch 'worker-han' of https://github.com/HSH02/NBE3-4-1-16Team into worker-han

  HSH02

  committed
  b822934

  Copy full SHA for b822934

• refactor: price type change

  solji-choi

  committed
  a9fd240

  Copy full SHA for a9fd240

• feat: made schema

  solji-choi

  committed
  9ef4bec

  Copy full SHA for 9ef4bec

• feat(order):

  Show description for 8e63dc0
  HSH02

  committed
  8e63dc0

  Copy full SHA for 8e63dc0

• feat: next.js install

  solji-choi

  committed
  b051ac1

  Copy full SHA for b051ac1

• Merge pull request #15 from HSH02/worker-han

  Show description for 52410c1
  HSH02

  authored
  52410c1

  Copy full SHA for 52410c1

• feat: create admin

  solji-choi

  committed
  b32661a

  Copy full SHA for b32661a

• Merge remote-tracking branch 'upstream/develop-branch' into worker-han

  HSH02

  committed
  505dc07

  Copy full SHA for 505dc07

• feat: install openapi-fetch, creat admin list

  solji-choi

  committed
  aab7281

  Copy full SHA for aab7281

• feat: list image

  solji-choi

  committed
  114ce30

  Copy full SHA for 114ce30

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  a0ef1da

  Copy full SHA for a0ef1da

• feat: create createPage

  solji-choi

  committed
  efb05b0

  Copy full SHA for efb05b0

• feat: list page 작업중

  solji-choi

  committed
  6d4a6d7

  Copy full SHA for 6d4a6d7

• test: 주문 테스트 코드 보완 작성

  sete3683

  committed
  d66503e

  Copy full SHA for d66503e

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  b077272

  Copy full SHA for b077272

• Merge remote-tracking branch 'upstream/feature/order' into feature/front-order

  HSH02

  committed
  fe4afea

  Copy full SHA for fe4afea

• feat(order):

  Show description for 7529473
  HSH02

  committed
  7529473

  Copy full SHA for 7529473

• feat(order) : add test next.js about order

  HSH02

  committed
  fdb074b

  Copy full SHA for fdb074b

• fix: remove api-docs.json from repository

  HSH02

  committed
  d7def38

  Copy full SHA for d7def38

• feat: style 완료

  solji-choi

  committed
  856476d

  Copy full SHA for 856476d

• feat: user product list style, refactor: layout

  solji-choi

  committed
  5b3e451

  Copy full SHA for 5b3e451

• refactor: font change

  solji-choi

  committed
  b9eef1a

  Copy full SHA for b9eef1a

Commits on Jan 17, 2025

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  cfc4900

  Copy full SHA for cfc4900

• 프론트:제품생성 추가 / cors를 해결하기 위해 appconfig webconfig추가

  UCLABgown

  committed
  264b6bf

  Copy full SHA for 264b6bf

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  018fc26

  Copy full SHA for 018fc26

• feat(order): add default page about order and fix next.js order / casue : user layout html tag

  HSH02

  committed
  a7c6845

  Copy full SHA for a7c6845

• Merge pull request #18 from HSH02/worker-han

  Show description for 2e7c325
  HSH02

  authored
  2e7c325

  Copy full SHA for 2e7c325

• feat: admin products list 완료

  solji-choi

  committed
  137aea5

  Copy full SHA for 137aea5

• feat(order) : add front order create templeate

  HSH02

  committed
  57b2dc6

  Copy full SHA for 57b2dc6

• feat(order) : add category to order create templeate

  HSH02

  committed
  9e3b139

  Copy full SHA for 9e3b139

• 수정 페이지

  UCLABgown

  committed
  f594967

  Copy full SHA for f594967

• Merge branch 'feat-front-product' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into feat-front-product

  UCLABgown

  committed
  775eaf3

  Copy full SHA for 775eaf3

• /amdin/products에서 admin//products/modify 파라미터값 값받아올수있게수정

  UCLABgown

  committed
  d6c48b5

  Copy full SHA for d6c48b5

• refactor: modify ì, create

  solji-choi

  committed
  9f86e6b

  Copy full SHA for 9f86e6b

• modify.client:빈 이미지 주소가 노출되는 문제해결 / modify 강사님코드 처럼 고침

  UCLABgown

  committed
  9aa5e77

  Copy full SHA for 9aa5e77

• add(order) : add cart template page of order and update style to className

  HSH02

  committed
  aa958bb

  Copy full SHA for aa958bb

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  75cfab8

  Copy full SHA for 75cfab8

• feat: 주문 조회 기능 추가

  sete3683

  committed
  8e4e891

  Copy full SHA for 8e4e891

• Merge remote-tracking branch 'upstream/feature/front-order' into worker-han

  HSH02

  committed
  96163a1

  Copy full SHA for 96163a1

• fixed: 충돌 해결

  sete3683

  committed
  fb8b7eb

  Copy full SHA for fb8b7eb

• feat(order) : add CREATE ORDER feature in ClientPage

  HSH02

  committed
  b30ea53

  Copy full SHA for b30ea53

• Merge remote-tracking branch 'upstream/feature/front-order' into worker-han

  HSH02

  committed
  eb886d5

  Copy full SHA for eb886d5

Commits on Jan 18, 2025

• 파일 업로드 기능 구현 / axios이용후/admin/products의 format(new Date(item.createDate))에서 오류

  UCLABgown

  committed
  9b77e90

  Copy full SHA for 9b77e90

Commits on Jan 19, 2025

• feat(order) : add feature cart of order

  HSH02

  committed
  a558bb6

  Copy full SHA for a558bb6

• Merge remote-tracking branch 'upstream/feat-front-product' into worker-han

  HSH02

  committed
  0554fa7

  Copy full SHA for 0554fa7

• feat: 주문 내역 페이징 및 출력 내용 추가

  sete3683

  committed
  0546c0f

  Copy full SHA for 0546c0f

• feat: 어드민 페이지 주문 조회 기능 추가

  sete3683

  committed
  5640061

  Copy full SHA for 5640061

Commits on Jan 20, 2025

• Merge remote-tracking branch 'upstream/feature/front-order' into worker-han

  HSH02

  committed
  7275436

  Copy full SHA for 7275436

• chore(order) : delete test data page about order

  HSH02

  committed
  06610a4

  Copy full SHA for 06610a4

• /damin/products Date인식문제해결 /damin/products/modify[id] 이미지 미수정시 없는거로 인식되는거해결

  UCLABgown

  committed
  82e01bb

  Copy full SHA for 82e01bb

• mvcConfiguration추가

  Show description for d510b55
  UCLABgown

  committed
  d510b55

  Copy full SHA for d510b55

• feat(order) : add delete feature of cart and refactor cart & create page

  HSH02

  committed
  56fb5e8

  Copy full SHA for 56fb5e8

• 이미지 파일 선택시 바로 업로드되게 수정 / 백엔드 이미지 에러 수정

  UCLABgown

  committed
  5b61f5e

  Copy full SHA for 5b61f5e

• 지원하지않는 파일형식시 오류출력

  UCLABgown

  committed
  8d2249e

  Copy full SHA for 8d2249e

• feat: search, paging (backend)

  solji-choi

  committed
  f85b105

  Copy full SHA for f85b105

• Merge branch 'feat-front-product' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into feat-front-product

  solji-choi

  committed
  430ec79

  Copy full SHA for 430ec79

• feat(order): modify about alert

  HSH02

  committed
  cc34e04

  Copy full SHA for cc34e04

• ProductService 충돌 해결

  solji-choi

  committed
  3ba99ed

  Copy full SHA for 3ba99ed

• fix: product create 오류 수정

  solji-choi

  committed
  bfed8f8

  Copy full SHA for bfed8f8

• 카테고리 선택기능 추가

  UCLABgown

  committed
  7f7e91e

  Copy full SHA for 7f7e91e

• feat: search, paging (frontend)

  solji-choi

  committed
  dce5e27

  Copy full SHA for dce5e27

• feat: 관리자 페이지 주문 수정 기능 추가

  sete3683

  committed
  13dd771

  Copy full SHA for 13dd771

• feat(order): modify main package

  HSH02

  committed
  55d654a

  Copy full SHA for 55d654a

• create 카테고리선택 / 일부 오류 수정

  UCLABgown

  committed
  750321e

  Copy full SHA for 750321e

• feat: category 서버에서 불러오도록

  solji-choi

  committed
  fca2333

  Copy full SHA for fca2333

• fix: 오류 수정

  solji-choi

  committed
  74f8806

  Copy full SHA for 74f8806

• fix: main list 안나오는 문제 수정

  solji-choi

  committed
  3e9705b

  Copy full SHA for 3e9705b

• 이미지 폴더 없던거 추가

  UCLABgown

  committed
  2321f03

  Copy full SHA for 2321f03

• chore(order): delete user package

  HSH02

  committed
  cf9f682

  Copy full SHA for cf9f682

• 다른 환경일시 이미지 등록안되는 문제해결

  UCLABgown

  committed
  46ec6a9

  Copy full SHA for 46ec6a9

• 카테고리 onChange문제로 첫번째 항목 수정안되는거 해결

  UCLABgown

  committed
  a0341bd

  Copy full SHA for a0341bd

• 카테고리 안바뀌는거 수정

  UCLABgown

  committed
  6411f3d

  Copy full SHA for 6411f3d

• Merge branch 'feat-front-product' into develop-branch

  Show description for 19401ff
  UCLABgown

  committed
  19401ff

  Copy full SHA for 19401ff

• fixed: front-order 브랜치와의 충돌 해결

  sete3683

  committed
  773fe24

  Copy full SHA for 773fe24

• fixed: 시간 출력 버그 해결

  sete3683

  committed
  80bfcc4

  Copy full SHA for 80bfcc4

• feat: admin login

  solji-choi

  committed
  dbee5f0

  Copy full SHA for dbee5f0

• test: login 실패 테스트 추가

  solji-choi

  committed
  834472c

  Copy full SHA for 834472c

• feat: spring secutiry 적용

  solji-choi

  committed
  000132a

  Copy full SHA for 000132a

• feat: jwt 적용

  solji-choi

  committed
  cbe94f2

  Copy full SHA for cbe94f2

• feat: create login page(front)

  solji-choi

  committed
  9209a4d

  Copy full SHA for 9209a4d

• feat: cookie 기능 추가

  solji-choi

  committed
  6b59099

  Copy full SHA for 6b59099

• feat: 인가(backend)

  solji-choi

  committed
  c00946f

  Copy full SHA for c00946f

• feat: logout 기능 구현(front)

  solji-choi

  committed
  76147a1

  Copy full SHA for 76147a1

• feat: 인가(frontend)

  solji-choi

  committed
  8bc8bcd

  Copy full SHA for 8bc8bcd

• fix: 오류수정, admin 메뉴 링크 수정

  solji-choi

  committed
  48bfc8d

  Copy full SHA for 48bfc8d

• fix: 주문 등록 권한 수정

  solji-choi

  committed
  0e4a812

  Copy full SHA for 0e4a812

• chore(order) : 테TDD 테스트 order 작동하도ë록 수정

  HSH02

  committed
  374ca0d

  Copy full SHA for 374ca0d

• feat: main list style

  solji-choi

  committed
  f8c2c5d

  Copy full SHA for f8c2c5d

• 오전/오후 문제해결 / os별 이미지 저장경로 수정 / 주문시 권한문제 해결

  UCLABgown

  committed
  70f7ea3

  Copy full SHA for 70f7ea3

• Merge branch 'develop-branch' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into develop-branch

  UCLABgown

  committed
  562ba34

  Copy full SHA for 562ba34

• feat: main list style2

  solji-choi

  committed
  e58bdcf

  Copy full SHA for e58bdcf

• feat: main list style

  solji-choi

  committed
  e9f022f

  Copy full SHA for e9f022f

• feat: main list style2

  solji-choi

  committed
  55fb3ee

  Copy full SHA for 55fb3ee

• Merge branch 'feat/style' of https://github.com/prgrms-be-devcourse/NBE3-4-1-16Team into feat/style

  solji-choi

  committed
  1c7aefc

  Copy full SHA for 1c7aefc

• feat: cart style

  solji-choi

  committed
  a10d763

  Copy full SHA for a10d763

• feat: cart style2, order list style

  solji-choi

  committed
  5328dc5

  Copy full SHA for 5328dc5

• feat: order list style2, Order Details style

  solji-choi

  committed
  32d2f9f

  Copy full SHA for 32d2f9f

• feat: admin products form style

  solji-choi

  committed
  0b9c8e4

  Copy full SHA for 0b9c8e4

• feat: admin order list style

  solji-choi

  committed
  97135dd

  Copy full SHA for 97135dd

• feat: admin order detail style

  solji-choi

  committed
  c13bfc7

  Copy full SHA for c13bfc7

Commits on Jan 21, 2025

• fix: /admin 페이지에 admin일 경우 /admin/products 로 리다이렉트, 로그인 페이지에서 로그아웃 버튼 숨김

  solji-choi

  committed
  762b64d

  Copy full SHA for 762b64d

• mac에서 /Users/ 아래에 저장안되는것같으니 /Users/[사용자이름]으로 수정 (안될수있음)

  UCLABgown

  committed
  d93d893

  Copy full SHA for d93d893

• fix: servlet error fix

  solji-choi

  committed
  aea07cb

  Copy full SHA for aea07cb

• /admin/products/ClientPage Date 받는형식수정

  UCLABgown

  committed
  031a6e8

  Copy full SHA for 031a6e8

• fixed: 날짜 출력 오류 수정 및 상태 변경 기능 수정

  sete3683

  committed
  c968703

  Copy full SHA for c968703