Skip to content

Commit

Permalink
Merge : product, product detail, main 병합
Browse files Browse the repository at this point in the history
  • Loading branch information
ohjiwon-201733026 committed Oct 13, 2022
1 parent 89a8638 commit e0a5ef9
Show file tree
Hide file tree
Showing 9 changed files with 58,691 additions and 9 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

<<<<<<< HEAD
# package
package.json
package-lock.json
=======

# IntelliJ
.idea
>>>>>>> origin/dev
29,708 changes: 29,708 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "kokodo",
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@mui/icons-material": "^5.10.9",
"@mui/material": "^5.10.9",
"@mui/styled-engine": "^5.10.8",
"@mui/styles": "^5.10.9",
"@mui/system": "^5.10.9",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^0.27.2",
"moment": "^2.29.4",
"react": "^18.2.0",
"react-cookie": "^4.1.1",
"react-datepicker": "^4.8.0",
"react-dom": "^18.2.0",
"react-js-pagination": "^3.0.3",
"react-router-dom": "^6.4.1",
"react-scripts": "5.0.1",
"sass": "^1.55.0",
"swiper": "^8.4.3",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "set PORT=9090 && react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
Loading

0 comments on commit e0a5ef9

Please sign in to comment.