From 2a8c42e42a169bfab4d2c58ef5ebfc56cc3e8d40 Mon Sep 17 00:00:00 2001
From: giogio165 <103351870+giogio165@users.noreply.github.com>
Date: Fri, 15 Sep 2023 22:44:17 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=A4=91=EB=B3=B5=EB=90=9C=EA=B1=B0=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProductManage.tsx |  1 +
 src/store/manageSlice.ts         |  4 ----
 src/store/productsSlice.ts       | 23 -----------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/components/ProductManage.tsx b/src/components/ProductManage.tsx
index 31aaab7..5c2159f 100644
--- a/src/components/ProductManage.tsx
+++ b/src/components/ProductManage.tsx
@@ -7,6 +7,7 @@ import { RootState, updateQuantity } from '../store/manageSlice';
 const ProductManage: React.FC = () => {
 	const dispatch = useDispatch();
 	const productInfo = useSelector((state: RootState) => state.manage.products);
+	console.log(productInfo);
 
 	const [editedProducts, setEditedProducts] = useState<{ [key: number]: boolean }>({});
 	const [editedQuantities, setEditedQuantities] = useState<{ [key: number]: number }>({});
diff --git a/src/store/manageSlice.ts b/src/store/manageSlice.ts
index 3383ef2..98425d9 100644
--- a/src/store/manageSlice.ts
+++ b/src/store/manageSlice.ts
@@ -8,10 +8,6 @@ const initialState: ProductLists = {
 export interface RootState {
 	manage: ProductLists;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> 4bf018ddb8ea17226a1b5d02ff436a4900428a0c
 const manageSlice = createSlice({
 	name: 'manage',
 	initialState,
diff --git a/src/store/productsSlice.ts b/src/store/productsSlice.ts
index daf83ab..7c90eeb 100644
--- a/src/store/productsSlice.ts
+++ b/src/store/productsSlice.ts
@@ -27,29 +27,6 @@ interface ProductsState {
 	status: string;
 }
 
-interface Product {
-	brand: string;
-	deliveryPrice: number;
-	description: string;
-	discountRate: number;
-	imageType: string;
-	imageUrl: string;
-	isDiscount: boolean;
-	isNew: boolean;
-	name: string;
-	optionList: any[];
-	price: number;
-	saleEndDate: string;
-	saleStartDate: string;
-}
-
-interface ProductsState {
-	products: any;
-	data: Product | null;
-	message: string;
-	status: string;
-}
-
 export type { ProductsState };
 
 const productsSlice = createSlice({

From b54c65e780843daec53a2e8f30daaea7561bfea9 Mon Sep 17 00:00:00 2001
From: giogio165 <103351870+giogio165@users.noreply.github.com>
Date: Fri, 15 Sep 2023 23:37:47 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=A7=88=EC=9D=B4=EB=84=88=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/manageSlice.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/store/manageSlice.ts b/src/store/manageSlice.ts
index 2aa4269..b0c8d7f 100644
--- a/src/store/manageSlice.ts
+++ b/src/store/manageSlice.ts
@@ -8,10 +8,7 @@ const initialState: ProductLists = {
 export interface RootState {
 	manage: ProductLists;
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> c50928afbd2ca8b1554daff5b2b20da2c0db7bd3
 const manageSlice = createSlice({
 	name: 'manage',
 	initialState,