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

[박상석] Sprint6 #240

Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b2e37bd
reset
hanseulhee Oct 10, 2023
6f8bbb0
Merge branch 'codeit-bootcamp-frontend:main' into main
hanseulhee Oct 10, 2023
e11e25f
fix: 머지 후 브랜치 삭제 github action 수정
hanseulhee Oct 10, 2023
212e864
env: workflows 폴더로 이동
hanseulhee Oct 10, 2023
4dc5dd0
Merge pull request #237 from hanseulhee/fix-github-actions
withyj-codeit Nov 6, 2023
a7dc0c7
sprint1
Oct 26, 2024
9c17641
sprint1
Oct 26, 2024
4fbc403
sprint1
Oct 26, 2024
b2d83c9
Merge pull request #33 from sang-seok/Basic-박상석-sprint1
withyj-codeit Oct 29, 2024
4cc6606
sprint2 commit
Nov 3, 2024
4e7ff0c
sprint2 commit
Nov 3, 2024
1608091
sprint2 commit
Nov 3, 2024
920630d
sprint2 commit
Nov 3, 2024
2166086
Merge pull request #95 from sang-seok/Basic-박상석-sprint2
withyj-codeit Nov 4, 2024
9eb28e3
스프린트 미션 3 작업 완료 첫 커밋
Nov 12, 2024
9b9a651
form 버튼 타입 수정
Nov 12, 2024
4a2e7a9
sprint3 작업 merge
Nov 15, 2024
5f9db45
sprint3 merge
Nov 15, 2024
86e70f3
commit
Nov 15, 2024
f57a371
sprint3 작업 완료 커밋
Nov 15, 2024
8d79a88
Merge remote-tracking branch 'upstream/Basic-박상석' into Basic-박상석-sprint3
Nov 16, 2024
8879ad2
sprint3 merge
Nov 16, 2024
166fdb1
sprint3 작업 커밋
Nov 16, 2024
9addac8
sprint4 작업 완료 첫 커밋
Nov 16, 2024
1b38799
파일 정리 커밋
Nov 23, 2024
8fc9e56
package.json homepage 속성 추가
Nov 23, 2024
635bcd6
package.json 원복
Nov 23, 2024
331acd4
최신순, 좋아요순 주석처리
Nov 23, 2024
7c06633
a태그 Link 태그로 수정
Nov 23, 2024
b80cf0b
사용하지 않는 함수 삭제
Nov 23, 2024
62c517d
build 오류 코드 삭제
Nov 23, 2024
da32a53
좋아요순, 최신순 선택 정렬 기능
Nov 24, 2024
1265705
Netlify 404 오류 파일 업로드
Nov 25, 2024
8176ac8
a태그 Link 수정
Nov 25, 2024
b7de30e
1.전체상품 10개만 표시 2.렌더링 시 로딩중 문구 추가
Nov 25, 2024
b5b2f7a
class className으로 변경
Nov 25, 2024
e5e4612
충돌파일 삭제 후 재생성
Dec 1, 2024
777112d
upstream merge 작업
Dec 1, 2024
ffed405
sprint6 작업 완성본 첫 커밋
Dec 1, 2024
7516d36
conflict 해결
Dec 5, 2024
b71eccb
conflict 해결 중 삭제 파일 복원 후 재커밋
Dec 5, 2024
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
7 changes: 7 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[build]
command = "npm run build"
publish = "build"
[[redirects]]
from = "/*"
to = "/index.html"
status = 200
10,290 changes: 5,305 additions & 4,985 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"name": "1-weekly-mission",
"name": "pandamarket",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"axios": "^1.7.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-scripts": "5.0.1",
"sass": "^1.81.0",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand All @@ -34,5 +37,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
1 change: 1 addition & 0 deletions public/_redirects.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/images/add_btn_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/arrow_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/del_btn_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/facebook_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/images/google_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/img01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/img02-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/img02-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/img02-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/img03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/insta_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions public/images/kakao_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/like_btn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/pwbtn_hidden_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/images/pwbtn_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/search_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/twitter_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions public/images/user_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/youtube_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading