Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 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
ecb234b
스프린트6 구조 및 기능 수정
Dec 7, 2024
384012d
React-박상석-sprint7 첫 커밋
Dec 7, 2024
32d2f3c
build 오류 axios 설치
Dec 7, 2024
e75081c
배포 오류 noImage 변수 삭제
Dec 7, 2024
6546339
배포 오류 사용하지 않는 변수 정리
Dec 7, 2024
235d1de
배포 오류 disabled 변수 할당
Dec 7, 2024
6a93951
1.수정하기, 삭제하기 토글 버튼 적용 2.상품태그 api 적용
Dec 8, 2024
6b12464
BestItem 함수 > bestItems 함수로 함수명 변경
Dec 8, 2024
9694c38
sprint8 작업 커밋
Jan 12, 2025
789b0b7
fix: Conflict 오류 해결
Jan 12, 2025
6f9bdb9
fix: 컴포넌트 모듈 오류 해결
Jan 12, 2025
1c8ade9
fix: 배포 오류 타입스크립트 버전 다운그레이
Jan 12, 2025
8670529
build: build 오류 1.img alt 적용 2.caniuse-lite 업데이트
Jan 12, 2025
8128105
build: 1.ProductInquiry컴포넌트에 disabled 임시삭제 2.ProductComment 컴포넌트 임시 삭제
Jan 13, 2025
587d10e
build: textarea type 삭제
Jan 13, 2025
3da9eef
build: netlify.toml 수정
Jan 13, 2025
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
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build]
command = "npm run build"
command = "CI=false npm run build"
publish = "build"
[[redirects]]
from = "/*"
Expand Down
92 changes: 63 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.5",
"@types/react": "^19.0.4",
"@types/react-dom": "^19.0.2",
"axios": "^1.7.9",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^7.0.2",
"react-scripts": "5.0.1",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
11 changes: 5 additions & 6 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import Home from './components/page/Home';
import ProductListPage from './components/page/ProductListPage';
import ProductRegPage from './components/page/ProductRegPage';
import ProductDetailPage from './components/page/ProductDetailPage';

import Home from './pages/Home';
import ProductListPage from './pages/ProductListPage';
import ProductRegPage from './pages/ProductRegPage';
import ProductDetailPage from './pages/ProductDetailPage';

function App() {
return (
Expand All @@ -12,7 +11,7 @@ function App() {
<Route path='/' element={<Home />} />
<Route path='/items' element={<ProductListPage />} />
<Route path='/additem' element={<ProductRegPage />} />
<Route path='/items/:productId' element={<ProductDetailPage />} />
<Route path='/items/:productId' element={<ProductDetailPage/>} />
</Routes>
</BrowserRouter>
);
Expand Down
20 changes: 20 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import Home from './pages/Home';
import ProductListPage from './pages/ProductListPage';
import ProductRegPage from './pages/ProductRegPage';
import ProductDetailPage from './pages/ProductDetailPage';

function App() {
return (
<BrowserRouter>
<Routes>
<Route path='/' element={<Home />} />
<Route path='/items' element={<ProductListPage />} />
<Route path='/additem' element={<ProductRegPage />} />
<Route path='/items/:productId' element={<ProductDetailPage />} />
</Routes>
</BrowserRouter>
);
}

export default App;
Loading
Loading