Code

KDT5 7조 프로젝트-WinkBook#7

Code

Open

foodeco wants to merge 158 commits intoKDT1-FE:mainKDT1-FE/KDT5-M5:mainfrom foodeco:KDT5_TeamWinkfoodeco/WinkBook:KDT5_TeamWinkCopy head branch name to clipboard

+13,034

Commits

Commits on Jun 9, 2023

• feat: Project all setting

  hahahaday12

  committed
  cba6640

  Copy full SHA for cba6640

• test: test

  foodeco

  committed
  1ac8646

  Copy full SHA for 1ac8646

• Merge pull request #1 from KDT5TeamWink/SeoDongUk

  Show description for 3241d8b
  foodeco

  authored
  3241d8b

  Copy full SHA for 3241d8b

• test

  saeyeonKim

  committed
  e54f678

  Copy full SHA for e54f678

Commits on Jun 12, 2023

• Feat: 상세페이지 연결, 추천 도서 추가

  foodeco

  committed
  637a883

  Copy full SHA for 637a883

• Feat: 추천도서

  foodeco

  committed
  f5ea74c

  Copy full SHA for f5ea74c

• Merge pull request #2 from KDT5TeamWink/SeoDongUk

  Show description for 09a915f
  foodeco

  authored
  09a915f

  Copy full SHA for 09a915f

• test

  saeyeonKim

  committed
  a35824b

  Copy full SHA for a35824b

• 결제부분 간격 수정

  jinyoungpark231

  committed
  eb658c2

  Copy full SHA for eb658c2

• feat: 상세페이지

  Show description for 29f1d96
  hahahaday12

  committed
  29f1d96

  Copy full SHA for 29f1d96

• feat: 변경사항 저장

  hahahaday12

  committed
  5489070

  Copy full SHA for 5489070

• Merge branch 'Dev' into kimHaEun

  hahahaday12

  authored
  68d2890

  Copy full SHA for 68d2890

• Merge pull request #3 from KDT5TeamWink/kimHaEun

  Show description for 28793d7
  hahahaday12

  authored
  28793d7

  Copy full SHA for 28793d7

• style: 카트페이지 결제부분수정

  jinyoungpark231

  committed
  dc5ece0

  Copy full SHA for dc5ece0

• test

  saeyeonKim

  committed
  9a768e9

  Copy full SHA for 9a768e9

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  5d0891d

  Copy full SHA for 5d0891d

Commits on Jun 13, 2023

• test: pull test

  dhmoon11

  committed
  89dbee9

  Copy full SHA for 89dbee9

• test: pull test

  dhmoon11

  committed
  e0902b8

  Copy full SHA for e0902b8

Commits on Jun 14, 2023

• style: 가격 할인율 추가

  foodeco

  committed
  0052752

  Copy full SHA for 0052752

• Merge pull request #4 from KDT5TeamWink/SeoDongUk

  Show description for b086e45
  foodeco

  authored
  b086e45

  Copy full SHA for b086e45

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  4cbe5e4

  Copy full SHA for 4cbe5e4

• feat: 유저정보페이지 기능구현

  dhmoon11

  committed
  09e60e2

  Copy full SHA for 09e60e2

• feat: DetailPage 기능 추가

  Show description for 05289cc
  hahahaday12

  committed
  05289cc

  Copy full SHA for 05289cc

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  f1ce3b8

  Copy full SHA for f1ce3b8

• feat: CartItem 기능 추가

  Show description for a3b9634
  hahahaday12

  committed
  a3b9634

  Copy full SHA for a3b9634

• feat: CartPage 기능 추가

  Show description for 687f1bf
  hahahaday12

  committed
  687f1bf

  Copy full SHA for 687f1bf

• Merge branch 'kimHaEun' of github.com:KDT5TeamWink/WinkBook into kimHaEun

  hahahaday12

  committed
  d4c0460

  Copy full SHA for d4c0460

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  5766416

  Copy full SHA for 5766416

• Merge pull request #5 from KDT5TeamWink/KimHaEun

  Show description for f16074d
  hahahaday12

  authored
  f16074d

  Copy full SHA for f16074d

• feat:cartpage add payment

  saeyeonKim

  committed
  d49dca8

  Copy full SHA for d49dca8

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  4451fbe

  Copy full SHA for 4451fbe

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  a645857

  Copy full SHA for a645857

• Merge pull request #6 from KDT5TeamWink/MoonDaeHyun

  Show description for 7a45da8
  dhmoon11

  authored
  7a45da8

  Copy full SHA for 7a45da8

• feat:cartpage-paymentbtn

  saeyeonKim

  committed
  ef36c2b

  Copy full SHA for ef36c2b

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  ae89928

  Copy full SHA for ae89928

• Merge pull request #7 from KDT5TeamWink/saeyeonKim

  Show description for 172ad85
  saeyeonKim

  authored
  172ad85

  Copy full SHA for 172ad85

• feat: 변경사항

  hahahaday12

  committed
  70c6ad0

  Copy full SHA for 70c6ad0

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  ec36eb0

  Copy full SHA for ec36eb0

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  e0cbd73

  Copy full SHA for e0cbd73

• Merge pull request #8 from KDT5TeamWink/KimHaEun

  Show description for 025d173
  hahahaday12

  authored
  025d173

  Copy full SHA for 025d173

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  3a41cbe

  Copy full SHA for 3a41cbe

Commits on Jun 15, 2023

• test: iamport-api test

  saeyeonKim

  committed
  10650ef

  Copy full SHA for 10650ef

• test: Push Test

  dhmoon11

  committed
  1bcaf59

  Copy full SHA for 1bcaf59

• delete : 필요없는 파일 삭제

  hahahaday12

  committed
  f297507

  Copy full SHA for f297507

• fix: 변경사항 update

  hahahaday12

  committed
  4a48a76

  Copy full SHA for 4a48a76

• Merge pull request #9 from KDT5TeamWink/KimHaEun

  Show description for 3c9ded4
  hahahaday12

  authored
  3c9ded4

  Copy full SHA for 3c9ded4

• Merge branch 'ParkJinYoung' of https://github.com/KDT5TeamWink/WinkBook into Dev

  jinyoungpark231

  committed
  a0b9ff6

  Copy full SHA for a0b9ff6

• testcommit

  saeyeonKim

  committed
  626d9a8

  Copy full SHA for 626d9a8

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  23e9ba0

  Copy full SHA for 23e9ba0

• test: push test

  dhmoon11

  committed
  c5e05a7

  Copy full SHA for c5e05a7

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  1364049

  Copy full SHA for 1364049

• Merge pull request #10 from KDT5TeamWink/saeyeonKim

  Show description for 47859d3
  saeyeonKim

  authored
  47859d3

  Copy full SHA for 47859d3

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  df65dc5

  Copy full SHA for df65dc5

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  69a2adf

  Copy full SHA for 69a2adf

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into Dev

  jinyoungpark231

  committed
  e733080

  Copy full SHA for e733080

• fix: 누락된 코드 추가

  hahahaday12

  committed
  cf06cb3

  Copy full SHA for cf06cb3

• Merge pull request #11 from KDT5TeamWink/KimHaEun

  Show description for d133176
  hahahaday12

  authored
  d133176

  Copy full SHA for d133176

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into Dev

  jinyoungpark231

  committed
  6d5e830

  Copy full SHA for 6d5e830

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  4c32f5d

  Copy full SHA for 4c32f5d

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  0543b8d

  Copy full SHA for 0543b8d

Commits on Jun 19, 2023

• feat: 필요없는 파일 삭제

  hahahaday12

  committed
  a635aeb

  Copy full SHA for a635aeb

• feat:검색결과창 퍼블리싱

  jinyoungpark231

  committed
  c83048b

  Copy full SHA for c83048b

• fix:payment정보연동,test:paymenttoken testing

  saeyeonKim

  committed
  c861ed6

  Copy full SHA for c861ed6

• test: push test

  dhmoon11

  committed
  124a878

  Copy full SHA for 124a878

• style: 책갈피 이미지

  hahahaday12

  committed
  6510812

  Copy full SHA for 6510812

• test: push test

  dhmoon11

  committed
  acbdbf1

  Copy full SHA for acbdbf1

• feat: 기능 추가사항 update

  Show description for 5cf6ad3
  hahahaday12

  committed
  5cf6ad3

  Copy full SHA for 5cf6ad3

• Merge pull request #12 from KDT5TeamWink/KimHaEun

  Show description for 12e8882
  hahahaday12

  authored
  12e8882

  Copy full SHA for 12e8882

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  6c2e742

  Copy full SHA for 6c2e742

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  ee1eb0b

  Copy full SHA for ee1eb0b

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  d30522e

  Copy full SHA for d30522e

• Merge pull request #13 from KDT5TeamWink/saeyeonKim

  Show description for 84f6586
  saeyeonKim

  authored
  84f6586

  Copy full SHA for 84f6586

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  d263788

  Copy full SHA for d263788

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  311ae2c

  Copy full SHA for 311ae2c

• Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into SearchPage

  jinyoungpark231

  committed
  372a2f9

  Copy full SHA for 372a2f9

Commits on Jun 20, 2023

• refactor:css전체적으로 수정

  jinyoungpark231

  committed
  64d9b2c

  Copy full SHA for 64d9b2c

Commits on Jun 22, 2023

• feat: api통신완료

  jinyoungpark231

  committed
  9dd5bd3

  Copy full SHA for 9dd5bd3

• refactor: api 타입 수정

  foodeco

  committed
  9c43d6f

  Copy full SHA for 9c43d6f

• feat: 수정사항 변경

  Show description for 0401d3d
  hahahaday12

  committed
  0401d3d

  Copy full SHA for 0401d3d

• feat: css수정

  dhmoon11

  committed
  8b5aaae

  Copy full SHA for 8b5aaae

• Merge pull request #14 from KDT5TeamWink/KimHaEun

  Show description for 559dc05
  hahahaday12

  authored
  559dc05

  Copy full SHA for 559dc05

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev

  dhmoon11

  committed
  ed2233e

  Copy full SHA for ed2233e

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun

  dhmoon11

  committed
  6e10ac2

  Copy full SHA for 6e10ac2

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  51b203e

  Copy full SHA for 51b203e

• feat: css수정

  dhmoon11

  committed
  5b68a7f

  Copy full SHA for 5b68a7f

• Merge pull request #15 from KDT5TeamWink/MoonDaeHyun

  Show description for c9d4dee
  dhmoon11

  authored
  c9d4dee

  Copy full SHA for c9d4dee

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  0fd69bc

  Copy full SHA for 0fd69bc

• Merge pull request #16 from KDT5TeamWink/SeoDongUk

  Show description for adb8ce3
  foodeco

  authored
  adb8ce3

  Copy full SHA for adb8ce3

• fix: detailpage scss 중괄호 수정

  foodeco

  committed
  e57adb8

  Copy full SHA for e57adb8

• test

  saeyeonKim

  committed
  355054d

  Copy full SHA for 355054d

Commits on Jun 23, 2023

• test

  saeyeonKim

  committed
  ceb2af8

  Copy full SHA for ceb2af8

• feat: searchpage router

  saeyeonKim

  committed
  748e999

  Copy full SHA for 748e999

• test

  saeyeonKim

  committed
  f475233

  Copy full SHA for f475233

• test

  saeyeonKim

  committed
  3b38189

  Copy full SHA for 3b38189

• test

  saeyeonKim

  committed
  1c4054e

  Copy full SHA for 1c4054e

• test

  saeyeonKim

  committed
  5332da2

  Copy full SHA for 5332da2

Commits on Jun 26, 2023

• feat: 필요없는 폴더 삭제

  hahahaday12

  committed
  673dd5a

  Copy full SHA for 673dd5a

• feat: 결제 취소 기능 추가

  Show description for d0b8c09
  hahahaday12

  committed
  d0b8c09

  Copy full SHA for d0b8c09

• Merge pull request #18 from KDT5TeamWink/KimHaEun

  Show description for 4aae7bb
  hahahaday12

  authored
  4aae7bb

  Copy full SHA for 4aae7bb

• Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  2c7154f

  Copy full SHA for 2c7154f

Commits on Jun 27, 2023

• style: 메인페이지 수정

  foodeco

  committed
  8454984

  Copy full SHA for 8454984

• fix: 변경사항 저장

  hahahaday12

  committed
  541f98d

  Copy full SHA for 541f98d

• feat:searchpage

  saeyeonKim

  committed
  9e2a916

  Copy full SHA for 9e2a916

• feat: css 수정

  dhmoon11

  committed
  3942361

  Copy full SHA for 3942361

• [20230627]7차pr-서동욱

  Show description for 39549c7
  foodeco

  authored
  39549c7

  Copy full SHA for 39549c7

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  8097341

  Copy full SHA for 8097341

• Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  e4d6773

  Copy full SHA for e4d6773

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun22

  dhmoon11

  committed
  0bf9d55

  Copy full SHA for 0bf9d55

• [230627]7차 pr - 김세연

  Show description for f36b6b8
  saeyeonKim

  authored
  f36b6b8

  Copy full SHA for f36b6b8

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  e3448ec

  Copy full SHA for e3448ec

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun22

  dhmoon11

  committed
  73e0e25

  Copy full SHA for 73e0e25

• feat: css 수정

  dhmoon11

  committed
  4d92436

  Copy full SHA for 4d92436

• feat: css수정

  dhmoon11

  committed
  dabba4f

  Copy full SHA for dabba4f

• feat: css추가 수정

  dhmoon11

  committed
  f74bdfc

  Copy full SHA for f74bdfc

• [20230627] 7차pr-문대현

  Show description for 7fe91cc
  dhmoon11

  authored
  7fe91cc

  Copy full SHA for 7fe91cc

• test

  saeyeonKim

  committed
  ae9a9c1

  Copy full SHA for ae9a9c1

• Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  385dd7a

  Copy full SHA for 385dd7a

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  4fa6492

  Copy full SHA for 4fa6492

• test

  saeyeonKim

  committed
  76de121

  Copy full SHA for 76de121

• style: 스타일 수정

  hahahaday12

  committed
  6bcc365

  Copy full SHA for 6bcc365

Commits on Jun 28, 2023

• style: 메인페이지 크기 rem으로 수정

  foodeco

  committed
  a36deab

  Copy full SHA for a36deab

• test

  saeyeonKim

  committed
  cc8e132

  Copy full SHA for cc8e132

Commits on Jun 29, 2023

• fix:search press enter

  saeyeonKim

  committed
  b13ba9a

  Copy full SHA for b13ba9a

• [20230629]8차pr-서동욱

  Show description for d449d0d
  foodeco

  authored
  d449d0d

  Copy full SHA for d449d0d

• feat: 기능추가, 변경사항 저장

  hahahaday12

  committed
  4509c47

  Copy full SHA for 4509c47

• Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  c48e3b2

  Copy full SHA for c48e3b2

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  06c78b5

  Copy full SHA for 06c78b5

• [20230629]8차pr-김하은

  Show description for f47099b
  hahahaday12

  authored
  f47099b

  Copy full SHA for f47099b

• Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  e8189f0

  Copy full SHA for e8189f0

Commits on Jun 30, 2023

• fix: 오류 수정

  Show description for 4d5bfa3
  hahahaday12

  committed
  4d5bfa3

  Copy full SHA for 4d5bfa3

• fix: 환경

  hahahaday12

  committed
  502a968

  Copy full SHA for 502a968

• fix: searchpage-css

  saeyeonKim

  committed
  4753562

  Copy full SHA for 4753562

• fix: 변경사항 업로드

  hahahaday12

  committed
  ef096b5

  Copy full SHA for ef096b5

• fix: 변경사항 업로드

  hahahaday12

  committed
  dc31ee0

  Copy full SHA for dc31ee0

• fix: 환경변수 수정

  foodeco

  committed
  5d247a7

  Copy full SHA for 5d247a7

• [20230630]9차pr-김하은

  Show description for 96c3706
  hahahaday12

  authored
  96c3706

  Copy full SHA for 96c3706

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  e0e8f86

  Copy full SHA for e0e8f86

• Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into saeyeonKim

  saeyeonKim

  committed
  ce84edc

  Copy full SHA for ce84edc

• style: css fix

  saeyeonKim

  committed
  fbd5b1f

  Copy full SHA for fbd5b1f

• [230701] 9차pr - 김세연

  Show description for fa25bee
  saeyeonKim

  authored
  fa25bee

  Copy full SHA for fa25bee

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  1ca80f3

  Copy full SHA for 1ca80f3

Commits on Jul 1, 2023

• style: 로그인/가입, 마이페이지 반응형 추가

  foodeco

  committed
  d1b2a61

  Copy full SHA for d1b2a61

• [20230701]10차pr-서동욱

  Show description for 9be743b
  foodeco

  authored
  9be743b

  Copy full SHA for 9be743b

• fix: 변경사항 저장

  hahahaday12

  committed
  e0fd429

  Copy full SHA for e0fd429

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun

  hahahaday12

  committed
  a4353f0

  Copy full SHA for a4353f0

• fix: 결제내역 출력 및 미사용 변수 제거

  foodeco

  committed
  f6f6c74

  Copy full SHA for f6f6c74

• fix: 기능 변경사항

  Show description for 7078bbd
  hahahaday12

  committed
  7078bbd

  Copy full SHA for 7078bbd

• fix: api 수정

  hahahaday12

  committed
  041676a

  Copy full SHA for 041676a

• [20230702]10차pr-김하은

  Show description for 91095f1
  hahahaday12

  authored
  91095f1

  Copy full SHA for 91095f1

Commits on Jul 2, 2023

• fix: 오류사항 수정

  hahahaday12

  committed
  67dc83d

  Copy full SHA for 67dc83d

• [20230702]11차 pr-김하은

  Show description for cbccc03
  hahahaday12

  authored
  cbccc03

  Copy full SHA for cbccc03

• fix: title 수정

  hahahaday12

  committed
  305d5b2

  Copy full SHA for 305d5b2

• Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk

  foodeco

  committed
  0fc00f1

  Copy full SHA for 0fc00f1

• [20230702]12차 pr-김하은

  Show description for 3abdc8f
  hahahaday12

  authored
  3abdc8f

  Copy full SHA for 3abdc8f

• fix: title 수정

  foodeco

  committed
  71bcce7

  Copy full SHA for 71bcce7

• style: 제목크기 단위 rem 변경

  foodeco

  committed
  db83193

  Copy full SHA for db83193

• doc: readme 추가

  foodeco

  committed
  33983f0

  Copy full SHA for 33983f0

• Merge branch 'KDT1-FE:main' into KDT5_TeamWink

  foodeco

  authored
  97725e6

  Copy full SHA for 97725e6