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

KDT5 7조 프로젝트-WinkBook #7

Open
wants to merge 158 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
cba6640
feat: Project all setting
hahahaday12 Jun 9, 2023
1ac8646
test: test
foodeco Jun 9, 2023
3241d8b
Merge pull request #1 from KDT5TeamWink/SeoDongUk
foodeco Jun 9, 2023
e54f678
test
saeyeonKim Jun 9, 2023
637a883
Feat: 상세페이지 연결, 추천 도서 추가
foodeco Jun 12, 2023
f5ea74c
Feat: 추천도서
foodeco Jun 12, 2023
09a915f
Merge pull request #2 from KDT5TeamWink/SeoDongUk
foodeco Jun 12, 2023
a35824b
test
saeyeonKim Jun 12, 2023
eb658c2
결제부분 간격 수정
jinyoungpark231 Jun 12, 2023
29f1d96
feat: 상세페이지
hahahaday12 Jun 12, 2023
5489070
feat: 변경사항 저장
hahahaday12 Jun 12, 2023
68d2890
Merge branch 'Dev' into kimHaEun
hahahaday12 Jun 12, 2023
28793d7
Merge pull request #3 from KDT5TeamWink/kimHaEun
hahahaday12 Jun 12, 2023
dc5ece0
style: 카트페이지 결제부분수정
jinyoungpark231 Jun 12, 2023
9a768e9
test
saeyeonKim Jun 12, 2023
5d0891d
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into s…
saeyeonKim Jun 12, 2023
89dbee9
test: pull test
dhmoon11 Jun 13, 2023
e0902b8
test: pull test
dhmoon11 Jun 13, 2023
0052752
style: 가격 할인율 추가
foodeco Jun 14, 2023
b086e45
Merge pull request #4 from KDT5TeamWink/SeoDongUk
foodeco Jun 14, 2023
4cbe5e4
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into s…
saeyeonKim Jun 14, 2023
09e60e2
feat: 유저정보페이지 기능구현
dhmoon11 Jun 14, 2023
05289cc
feat: DetailPage 기능 추가
hahahaday12 Jun 14, 2023
f1ce3b8
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 14, 2023
a3b9634
feat: CartItem 기능 추가
hahahaday12 Jun 14, 2023
687f1bf
feat: CartPage 기능 추가
hahahaday12 Jun 14, 2023
d4c0460
Merge branch 'kimHaEun' of github.com:KDT5TeamWink/WinkBook into kimH…
hahahaday12 Jun 14, 2023
5766416
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 14, 2023
f16074d
Merge pull request #5 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 14, 2023
d49dca8
feat:cartpage add payment
saeyeonKim Jun 14, 2023
4451fbe
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 14, 2023
a645857
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 14, 2023
7a45da8
Merge pull request #6 from KDT5TeamWink/MoonDaeHyun
dhmoon11 Jun 14, 2023
ef36c2b
feat:cartpage-paymentbtn
saeyeonKim Jun 14, 2023
ae89928
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into s…
saeyeonKim Jun 14, 2023
172ad85
Merge pull request #7 from KDT5TeamWink/saeyeonKim
saeyeonKim Jun 14, 2023
70c6ad0
feat: 변경사항
hahahaday12 Jun 14, 2023
ec36eb0
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 14, 2023
e0cbd73
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 14, 2023
025d173
Merge pull request #8 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 14, 2023
3a41cbe
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 14, 2023
10650ef
test: iamport-api test
saeyeonKim Jun 15, 2023
1bcaf59
test: Push Test
dhmoon11 Jun 15, 2023
f297507
delete : 필요없는 파일 삭제
hahahaday12 Jun 15, 2023
4a48a76
fix: 변경사항 update
hahahaday12 Jun 15, 2023
3c9ded4
Merge pull request #9 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 15, 2023
a0b9ff6
Merge branch 'ParkJinYoung' of https://github.com/KDT5TeamWink/WinkBo…
jinyoungpark231 Jun 15, 2023
626d9a8
testcommit
saeyeonKim Jun 15, 2023
23e9ba0
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 15, 2023
c5e05a7
test: push test
dhmoon11 Jun 15, 2023
1364049
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 15, 2023
47859d3
Merge pull request #10 from KDT5TeamWink/saeyeonKim
saeyeonKim Jun 15, 2023
df65dc5
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 15, 2023
69a2adf
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 15, 2023
e733080
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into Dev
jinyoungpark231 Jun 15, 2023
cf06cb3
fix: 누락된 코드 추가
hahahaday12 Jun 15, 2023
d133176
Merge pull request #11 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 15, 2023
6d5e830
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into Dev
jinyoungpark231 Jun 15, 2023
4c32f5d
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 15, 2023
0543b8d
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 15, 2023
a635aeb
feat: 필요없는 파일 삭제
hahahaday12 Jun 19, 2023
c83048b
feat:검색결과창 퍼블리싱
jinyoungpark231 Jun 19, 2023
c861ed6
fix:payment정보연동,test:paymenttoken testing
saeyeonKim Jun 19, 2023
124a878
test: push test
dhmoon11 Jun 19, 2023
6510812
style: 책갈피 이미지
hahahaday12 Jun 19, 2023
acbdbf1
test: push test
dhmoon11 Jun 19, 2023
5cf6ad3
feat: 기능 추가사항 update
hahahaday12 Jun 19, 2023
12e8882
Merge pull request #12 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 19, 2023
6c2e742
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into s…
saeyeonKim Jun 19, 2023
ee1eb0b
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 19, 2023
d30522e
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 19, 2023
84f6586
Merge pull request #13 from KDT5TeamWink/saeyeonKim
saeyeonKim Jun 19, 2023
d263788
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 19, 2023
311ae2c
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 19, 2023
372a2f9
Merge branch 'Dev' of https://github.com/KDT5TeamWink/WinkBook into S…
jinyoungpark231 Jun 19, 2023
64d9b2c
refactor:css전체적으로 수정
jinyoungpark231 Jun 20, 2023
9dd5bd3
feat: api통신완료
jinyoungpark231 Jun 22, 2023
9c43d6f
refactor: api 타입 수정
foodeco Jun 22, 2023
0401d3d
feat: 수정사항 변경
hahahaday12 Jun 22, 2023
8b5aaae
feat: css수정
dhmoon11 Jun 22, 2023
559dc05
Merge pull request #14 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 22, 2023
ed2233e
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into Dev
dhmoon11 Jun 22, 2023
6e10ac2
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into MoonDaeHyun
dhmoon11 Jun 22, 2023
51b203e
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jun 22, 2023
5b68a7f
feat: css수정
dhmoon11 Jun 22, 2023
c9d4dee
Merge pull request #15 from KDT5TeamWink/MoonDaeHyun
dhmoon11 Jun 22, 2023
0fd69bc
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jun 22, 2023
adb8ce3
Merge pull request #16 from KDT5TeamWink/SeoDongUk
foodeco Jun 22, 2023
e57adb8
fix: detailpage scss 중괄호 수정
foodeco Jun 22, 2023
355054d
test
saeyeonKim Jun 22, 2023
ceb2af8
test
saeyeonKim Jun 23, 2023
748e999
feat: searchpage router
saeyeonKim Jun 23, 2023
f475233
test
saeyeonKim Jun 23, 2023
3b38189
test
saeyeonKim Jun 23, 2023
1c4054e
test
saeyeonKim Jun 23, 2023
5332da2
test
saeyeonKim Jun 23, 2023
673dd5a
feat: 필요없는 폴더 삭제
hahahaday12 Jun 26, 2023
d0b8c09
feat: 결제 취소 기능 추가
hahahaday12 Jun 26, 2023
4aae7bb
Merge pull request #18 from KDT5TeamWink/KimHaEun
hahahaday12 Jun 26, 2023
2c7154f
Merge branch 'Dev' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jun 26, 2023
8454984
style: 메인페이지 수정
foodeco Jun 27, 2023
541f98d
fix: 변경사항 저장
hahahaday12 Jun 27, 2023
9e2a916
feat:searchpage
saeyeonKim Jun 27, 2023
3942361
feat: css 수정
dhmoon11 Jun 27, 2023
39549c7
[20230627]7차pr-서동욱
foodeco Jun 27, 2023
8097341
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 27, 2023
e4d6773
Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into …
saeyeonKim Jun 27, 2023
0bf9d55
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into MoonDaeH…
dhmoon11 Jun 27, 2023
f36b6b8
[230627]7차 pr - 김세연
saeyeonKim Jun 27, 2023
e3448ec
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 27, 2023
73e0e25
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into MoonDaeH…
dhmoon11 Jun 27, 2023
4d92436
feat: css 수정
dhmoon11 Jun 27, 2023
dabba4f
feat: css수정
dhmoon11 Jun 27, 2023
f74bdfc
feat: css추가 수정
dhmoon11 Jun 27, 2023
7fe91cc
[20230627] 7차pr-문대현
dhmoon11 Jun 27, 2023
ae9a9c1
test
saeyeonKim Jun 27, 2023
385dd7a
Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into …
saeyeonKim Jun 27, 2023
4fa6492
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 27, 2023
76de121
test
saeyeonKim Jun 27, 2023
6bcc365
style: 스타일 수정
hahahaday12 Jun 27, 2023
a36deab
style: 메인페이지 크기 rem으로 수정
foodeco Jun 28, 2023
cc8e132
test
saeyeonKim Jun 28, 2023
b13ba9a
fix:search press enter
saeyeonKim Jun 29, 2023
d449d0d
[20230629]8차pr-서동욱
foodeco Jun 29, 2023
4509c47
feat: 기능추가, 변경사항 저장
hahahaday12 Jun 29, 2023
c48e3b2
Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into …
saeyeonKim Jun 29, 2023
06c78b5
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jun 29, 2023
f47099b
[20230629]8차pr-김하은
hahahaday12 Jun 29, 2023
e8189f0
Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into …
saeyeonKim Jun 29, 2023
4d5bfa3
fix: 오류 수정
hahahaday12 Jun 30, 2023
502a968
fix: 환경
hahahaday12 Jun 30, 2023
4753562
fix: searchpage-css
saeyeonKim Jun 30, 2023
ef096b5
fix: 변경사항 업로드
hahahaday12 Jun 30, 2023
dc31ee0
fix: 변경사항 업로드
hahahaday12 Jun 30, 2023
5d247a7
fix: 환경변수 수정
foodeco Jun 30, 2023
96c3706
[20230630]9차pr-김하은
hahahaday12 Jun 30, 2023
e0e8f86
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jun 30, 2023
ce84edc
Merge branch 'Dev2' of https://github.com/KDT5TeamWink/WinkBook into …
saeyeonKim Jun 30, 2023
fbd5b1f
style: css fix
saeyeonKim Jun 30, 2023
fa25bee
[230701] 9차pr - 김세연
saeyeonKim Jun 30, 2023
1ca80f3
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jun 30, 2023
d1b2a61
style: 로그인/가입, 마이페이지 반응형 추가
foodeco Jul 1, 2023
9be743b
[20230701]10차pr-서동욱
foodeco Jul 1, 2023
e0fd429
fix: 변경사항 저장
hahahaday12 Jul 1, 2023
a4353f0
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into KimHaEun
hahahaday12 Jul 1, 2023
f6f6c74
fix: 결제내역 출력 및 미사용 변수 제거
foodeco Jul 1, 2023
7078bbd
fix: 기능 변경사항
hahahaday12 Jul 1, 2023
041676a
fix: api 수정
hahahaday12 Jul 1, 2023
91095f1
[20230702]10차pr-김하은
hahahaday12 Jul 1, 2023
67dc83d
fix: 오류사항 수정
hahahaday12 Jul 2, 2023
cbccc03
[20230702]11차 pr-김하은
hahahaday12 Jul 2, 2023
305d5b2
fix: title 수정
hahahaday12 Jul 2, 2023
0fc00f1
Merge branch 'Dev2' of github.com:KDT5TeamWink/WinkBook into SeoDongUk
foodeco Jul 2, 2023
3abdc8f
[20230702]12차 pr-김하은
hahahaday12 Jul 2, 2023
71bcce7
fix: title 수정
foodeco Jul 2, 2023
db83193
style: 제목크기 단위 rem 변경
foodeco Jul 2, 2023
33983f0
doc: readme 추가
foodeco Jul 2, 2023
97725e6
Merge branch 'KDT1-FE:main' into KDT5_TeamWink
foodeco Jul 2, 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
14 changes: 14 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = {
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': 'warn',
},
}
25 changes: 25 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
.env
node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.env
14 changes: 14 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="./public/images/Wink_logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>WinkBook</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

Loading