Skip to content

Commit 13f4f1b

Browse files
JeongSangByukJeongSangByuk
committed
[TERK-80/Refactor] 패키징 정리
1 parent f811358 commit 13f4f1b

28 files changed

+79
-80
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ yarn-debug.log*
2323
yarn-error.log*
2424

2525
package-lock.json
26+
.idea

‎.prettierrc

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"arrowParens": "avoid",
3-
"endOfLine": "auto",
4-
"htmlWhitespaceSensitivity": "css",
5-
"printWidth": 120,
6-
"semi": true,
7-
"singleQuote": true,
8-
"tabWidth": 4,
9-
"trailingComma": "all"
10-
}
2+
"arrowParens": "avoid",
3+
"endOfLine": "auto",
4+
"htmlWhitespaceSensitivity": "css",
5+
"printWidth": 120,
6+
"semi": true,
7+
"singleQuote": true,
8+
"tabWidth": 4,
9+
"trailingComma": "all"
10+
}

‎public/search-box.png

-8.75 KB
Binary file not shown.

‎src/App.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react';
22
import { Route, Routes } from 'react-router-dom';
33
import { createGlobalStyle } from 'styled-components';
4-
import CartShareDetailPage from './pages/CartShareDetailPage';
5-
import CartSharePage from './pages/CartSharePage';
4+
import CartShareDetailPage from './pages/order/CartShareDetailPage';
5+
import CartSharePage from './pages/order/CartSharePage';
66
import MainPage from './pages/MainPage';
7-
import LoginPage from './pages/LoginPage';
8-
import ItemListPage from './pages/ItemListPage';
9-
import ItemDetailPage from './pages/ItemDetailPage';
7+
import LoginPage from './pages/mbr/LoginPage';
8+
import ItemListPage from './pages/item/ItemListPage';
9+
import ItemDetailPage from './pages/item/ItemDetailPage';
1010

1111
const GlobalStyle = createGlobalStyle`
1212
* {

‎src/api/item.js ‎src/api/item/item.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { axiosInstance } from './instance';
1+
import { axiosInstance } from '../instance';
22

33
export const getAllItemList = () =>
4-
axiosInstance.get('http://localhost:8000/item/api/item',
4+
axiosInstance.get('/item/api/item',
55
).catch(() => {
66
alert('상품 리스트 조회 실패');
77
});
88

99
export const getItem = (itemId) =>
10-
axiosInstance.get('http://localhost:8000/item/api/item/' + itemId,
10+
axiosInstance.get('/item/api/item/' + itemId,
1111
).catch(() => {
1212
alert('상품 조회 실패');
1313
});

‎src/api/login.js ‎src/api/mbr/login.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { axiosInstance } from './instance';
1+
import { axiosInstance } from '../instance';
22

33
export const login = (id, pwd) =>
44
axiosInstance.post('http://localhost:8000/member/api/auth/login', {

‎src/api/cart-share.js ‎src/api/order/cart-share.js

File renamed without changes.

‎public/cart-share.png ‎src/assets/cart-share.png

File renamed without changes.

‎public/cart.png ‎src/assets/cart.png

File renamed without changes.

‎public/sausage-logo.png ‎src/assets/sausage-logo.png

File renamed without changes.

‎src/components/Item/Item.js ‎src/components/item/Item.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Item = ({index, itemNm, brandNm, itemAmt, itemImgUrl, onClickItem, shppTyp
1212
<div>
1313
쓱배송
1414
</div>
15-
<img src='cart.png' />
15+
<img src={require('../../assets/cart.png')} />
1616
</ShppCategory>
1717

1818
<ItemLine />
@@ -26,7 +26,7 @@ const Item = ({index, itemNm, brandNm, itemAmt, itemImgUrl, onClickItem, shppTyp
2626

2727
<ItemAmt>
2828
<p>
29-
{itemAmt}
29+
{itemAmt.toLocaleString()}
3030
</p>
3131
<p>
3232
원

‎src/components/Item/ItemDetail.js ‎src/components/item/ItemDetail.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import styled from 'styled-components';
22
import SearchBox from './SearchBox';
3-
import PurchaseModal from './PurchaseModal';
3+
import ItemPurchaseModal from './ItemPurchaseModal';
44

55
const ItemDetail = ({
66
itemImgUrl, brandNm, itemNm, itemAmt
7-
, isPurchaseModalOn, setPurchaseModalOn, itemQty, setItemQty,
7+
, isPurchaseModalOn, setPurchaseModalOn, itemQty, plusItemQty, minusItemQty,
88
}) => {
99

1010
return (
@@ -32,14 +32,14 @@ const ItemDetail = ({
3232
</ItemTitle>
3333

3434
<ItemAmt>
35-
<b>{itemAmt}</b> 원
35+
<b>{itemAmt.toLocaleString()}</b> 원
3636
</ItemAmt>
3737
</div>
3838

3939
{
4040
isPurchaseModalOn ?
41-
<PurchaseModal itemNm={itemNm} itemBrandNm='test' itemAmt={itemAmt}
42-
itemQty={itemQty} setItemQty={setItemQty} /> :
41+
<ItemPurchaseModal itemNm={itemNm} itemBrandNm='test' itemAmt={itemAmt}
42+
itemQty={itemQty} plusItemQty={plusItemQty} minusItemQty={minusItemQty} /> :
4343

4444
<PurchaseButton onClick={setPurchaseModalOn}>
4545
구매하기
@@ -112,6 +112,7 @@ const ItemAmt = styled.div`
112112
font-size: 20px;
113113
margin-left: 20px;
114114
margin-top: 20px;
115+
115116
116117
`;
117118

‎src/components/Item/ItemList.js ‎src/components/item/ItemList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const ItemList = ({ itemList, onClickItem }) => {
2323
index={index + 1}
2424
itemNm={it.itemNm}
2525
itemImgUrl={it.itemImgUrl}
26-
itemAmt={it.itemAmt}
26+
itemAmt={it.itemAmt.toLocaleString()}
2727
onClickItem={() => onClickItem(it.id)}
2828
brandNm='test'
2929
/>

‎src/components/Item/PurchaseModal.js ‎src/components/item/ItemPurchaseModal.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import styled from 'styled-components';
2-
import CartShare from '../CartShare';
2+
import CartShare from '../order/CartShare';
33

4-
const PurchaseModal = ({itemBrandNm ,itemNm, itemAmt, itemQty, setItemQty}) => {
4+
const ItemPurchaseModal = ({itemBrandNm ,itemNm, itemAmt, itemQty, plusItemQty, minusItemQty}) => {
55

66
return (
77

@@ -17,21 +17,21 @@ const PurchaseModal = ({itemBrandNm ,itemNm, itemAmt, itemQty, setItemQty}) => {
1717

1818
<div>
1919

20-
<MinusBox>
20+
<MinusBox onClick={minusItemQty}>
2121
-
2222
</MinusBox>
2323

2424
<QtyBox>
2525
{itemQty}
2626
</QtyBox>
2727

28-
<PlusBox>
28+
<PlusBox onClick={plusItemQty}>
2929
+
3030
</PlusBox>
3131
</div>
3232

3333
<div>
34-
{itemAmt} 원
34+
{itemAmt.toLocaleString()} 원
3535
</div>
3636

3737
</ItemAmtBox>
@@ -45,7 +45,7 @@ const PurchaseModal = ({itemBrandNm ,itemNm, itemAmt, itemQty, setItemQty}) => {
4545
</p>
4646

4747
<p>
48-
{itemAmt * itemQty}
48+
{(itemAmt * itemQty).toLocaleString()}
4949
</p>
5050

5151
<p>
@@ -215,4 +215,4 @@ const PurchaseButton = styled.button`
215215
216216
`;
217217

218-
export default PurchaseModal;
218+
export default ItemPurchaseModal;

‎src/components/Item/SearchBox.js ‎src/components/item/SearchBox.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import styled from 'styled-components';
22

33
const searchBox = () => {
4-
return(
5-
<SearchContainer>
6-
<img id='logo' src='/sausage-logo.png' />
7-
<div id='search-box'></div>
8-
<img id='cart-share' src='/cart-share.png' />
9-
</SearchContainer>
10-
)
11-
}
4+
return (
5+
<SearchContainer>
6+
<img id='logo' src={require('../../assets/sausage-logo.png')} />
7+
<div id='search-box'></div>
8+
<img id='cart-share' src={require('../../assets/cart-share.png')} />
9+
</SearchContainer>
10+
);
11+
};
1212

1313

1414
const SearchContainer = styled.div`
@@ -41,4 +41,4 @@ const SearchContainer = styled.div`
4141
`;
4242

4343

44-
export default searchBox
44+
export default searchBox;

‎src/components/CartShare.js ‎src/components/order/CartShare.js

File renamed without changes.

‎src/components/CartShareDetail.js ‎src/components/order/CartShareDetail.js

File renamed without changes.

‎src/containers/item/ItemContainer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import Login from '../../components/mbr/Login';
2-
import { login } from '../../api/login';
2+
import { login } from '../../api/mbr/login';
33
import { useEffect, useState } from 'react';
44
import { useCookies } from 'react-cookie';
5-
import ItemList from '../../components/Item/ItemList';
6-
import { findCartShareList } from '../../api/cart-share';
7-
import { getAllItemList } from '../../api/item';
5+
import ItemList from '../../components/item/ItemList';
6+
import { findCartShareList } from '../../api/order/cart-share';
7+
import { getAllItemList } from '../../api/item/item';
88
import { useNavigate } from 'react-router-dom';
99

1010
const ItemListContainer = () => {

‎src/containers/item/ItemDetailContainer.js

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,46 @@
1-
2-
import ItemDetail from '../../components/Item/ItemDetail';
1+
import ItemDetail from '../../components/item/ItemDetail';
32
import { useEffect, useState } from 'react';
4-
import { getAllItemList, getItem } from '../../api/item';
3+
import { getAllItemList, getItem } from '../../api/item/item';
54
import { useParams } from 'react-router-dom';
65

76
const ItemDetailContainer = () => {
87

98
let { itemId } = useParams();
10-
const [itemImgUrl, setItemImgUrl] = useState();
11-
const [itemNm, setItemNm] = useState()
12-
const [itemAmt, setIteAmt] = useState();
13-
const [itemQty, setItemQty] = useState(2);
9+
const [itemImgUrl, setItemImgUrl] = useState("");
10+
const [itemNm, setItemNm] = useState("");
11+
const [itemAmt, setIteAmt] = useState(0);
12+
const [itemQty, setItemQty] = useState(1);
1413
const [isPurchaseModalOn, setPurchaseModalOn] = useState(false);
1514

15+
const plusItemQty = () => {
16+
setItemQty(itemQty + 1);
17+
};
18+
19+
const minusItemQty = () => {
20+
if (itemQty > 1) {
21+
setItemQty(itemQty - 1);
22+
}
23+
};
1624

1725
useEffect(() => {
1826

19-
console.log(itemId)
27+
console.log(itemId);
2028

2129
getItem(itemId).then(response => {
2230

23-
console.log(response.data.data);
24-
setItemImgUrl(response.data.data.itemImgUrl);
25-
setItemNm(response.data.data.itemNm);
26-
setIteAmt(response.data.data.itemAmt)
27-
31+
console.log(response.data.data);
32+
setItemImgUrl(response.data.data.itemImgUrl);
33+
setItemNm(response.data.data.itemNm);
34+
setIteAmt(response.data.data.itemAmt);
2835
},
2936
);
3037

3138
}, []);
3239

3340

34-
return <ItemDetail itemImgUrl={itemImgUrl} itemNm={itemNm} itemAmt={itemAmt} itemBrandNm = 'test'
41+
return <ItemDetail itemImgUrl={itemImgUrl} itemNm={itemNm} itemAmt={itemAmt} itemBrandNm='test'
3542
isPurchaseModalOn={isPurchaseModalOn} setPurchaseModalOn={setPurchaseModalOn}
36-
itemQty = {itemQty} setItemQty = {setItemQty}/>;
43+
itemQty={itemQty} plusItemQty={plusItemQty} minusItemQty = {minusItemQty}/>;
3744
};
3845

3946
export default ItemDetailContainer;

‎src/containers/mbr/LoginContainer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Login from '../../components/mbr/Login';
2-
import { login } from '../../api/login';
2+
import { login } from '../../api/mbr/login';
33
import { useState } from 'react';
44
import {useCookies} from 'react-cookie'
55
import { axiosInstance } from '../../api/instance';

‎src/containers/CartShareContainer.js ‎src/containers/order/CartShareContainer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect, useRef } from 'react';
22
import { useNavigate } from 'react-router-dom';
3-
import { findCartShareList } from '../api/cart-share';
4-
import CartShare from '../components/CartShare';
3+
import { findCartShareList } from '../../api/order/cart-share';
4+
import CartShare from '../../components/order/CartShare';
55

66
const CartShareContainer = () => {
77
const navigate = useNavigate();

‎src/containers/CartShareDetailContainer.js ‎src/containers/order/CartShareDetailContainer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useEffect, useRef } from 'react';
2-
import CartShareDetail from '../components/CartShareDetail';
2+
import CartShareDetail from '../../components/order/CartShareDetail';
33
import { useParams } from 'react-router-dom';
44

55
const CartShareDetailContainer = () => {

‎src/pages/ItemDetailPage.js ‎src/pages/item/ItemDetailPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import ItemDetailContainer from '../containers/item/ItemDetailContainer';
2+
import ItemDetailContainer from '../../containers/item/ItemDetailContainer';
33

44
const ItemDetailPage = () => {
55
return <ItemDetailContainer/>

‎src/pages/ItemListPage.js ‎src/pages/item/ItemListPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import ItemListContainer from '../containers/item/ItemContainer';
2+
import ItemListContainer from '../../containers/item/ItemContainer';
33

44
const ItemListPage = () => {
55
return <ItemListContainer/>

‎src/pages/LoginPage.js ‎src/pages/mbr/LoginPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import LoginContainer from '../containers/mbr/LoginContainer';
2+
import LoginContainer from '../../containers/mbr/LoginContainer';
33

44
const LoginPage = () => {
55
return <LoginContainer/>

‎src/pages/CartShareDetailPage.js ‎src/pages/order/CartShareDetailPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import CartShareDetailContainer from '../containers/CartShareDetailContainer';
2+
import CartShareDetailContainer from '../../containers/order/CartShareDetailContainer';
33

44
const CartShareDetailPage = () => {
55
return <CartShareDetailContainer />;

‎src/pages/CartSharePage.js ‎src/pages/order/CartSharePage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import CartShareContainer from '../containers/CartShareContainer';
2+
import CartShareContainer from '../../containers/order/CartShareContainer';
33

44
const CartSharePage = () => {
55
return <CartShareContainer />;

‎src/setupProxy.js

-10
This file was deleted.

0 commit comments

Comments
 (0)