diff --git a/.gitignore b/.gitignore index 4d29575..188c699 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,9 @@ /node_modules /.pnp .pnp.js - +yarn.lock # Add this line +package-lock.json # Add this line +package.json # Add this line # testing /coverage diff --git a/src/App.js b/src/App.js index d8dac3f..d02f158 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,5 @@ import { Route, Routes } from "react-router-dom"; -import MainPageComponent from "./Components/MainPage/MainPageComponent"; +import MainPageComponent from "./Pages/MainPageComponent"; // 마이페이지(고객님) import MyPageCustomerComponent from "./Pages/MyPageCustomer"; import EditProfile from "./Components/myPage/myPage(Customer)/EditProfile"; @@ -56,118 +56,51 @@ function App() { } /> } /> + {/* Seller 부분 */} }> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + }> - } /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> - }/> - }> - }> - } /> - } - /> - } - /> - } - /> - } - /> - } - /> - + } /> + } /> - } - /> - } - /> - - } /> - } /> - - } /> - } /> - } /> - } /> + } /> + } /> + + }> + } /> + + + }> + } /> + } /> + } /> - } /> + } /> - - } /> - } /> + + }> + } /> diff --git a/src/Components/MainPage/MainPageComponent.jsx b/src/Pages/MainPageComponent.jsx similarity index 82% rename from src/Components/MainPage/MainPageComponent.jsx rename to src/Pages/MainPageComponent.jsx index 066613d..f0c7bc5 100644 --- a/src/Components/MainPage/MainPageComponent.jsx +++ b/src/Pages/MainPageComponent.jsx @@ -1,17 +1,17 @@ import React, { useState, useRef } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import LeftArrow from '../../img/LeftArrow.png'; -import RightArrow from '../../img/RightArrow.png'; -import Banner from '../../img/banner.svg'; -import NavigationCategoryMenu from '../NavigationMenu/NavigationCategoryMenu'; -import NavigationMenu from '../NavigationMenu/NavigationMenu'; -import ProductCardComponent from '../Global/ProductComponent'; +import LeftArrow from '../img/LeftArrow.png'; +import RightArrow from '../img/RightArrow.png'; +import Banner from '../img/banner.svg'; +import NavigationCategoryMenu from '../Components/NavigationMenu/NavigationCategoryMenu'; +import NavigationMenu from '../Components/NavigationMenu/NavigationMenu'; +import ProductCardComponent from '../Components/Global/ProductComponent'; import { useEffect } from 'react'; -import HeaderComponent from '../Header/Header'; -import CustomHorizontalLine from './HorizontalLineComponent'; -import ArrowCircleRight from '../../img/arrow-circle-right.png'; -import BaseFooter from '../Footer/BaseFooter'; +import HeaderComponent from '../Components/Header/Header'; +import CustomHorizontalLine from '../Components/MainPage/HorizontalLineComponent'; +import ArrowCircleRight from '../img/arrow-circle-right.png'; +import BaseFooter from '../Components/Footer/BaseFooter'; const PageContainer = styled.div` width: 100%; @@ -127,7 +127,26 @@ function MainPageComponent() { setCurrentIndex(currentIndex - 1); } }; - + // useEffect(() => { + // const fetchData = async () => { + // try { + // const response = await axios.get('https://dev.the-goods.store/api/item/main?type=new&page=1', { + // headers: { + // 'accept': '*/*' + // } + // }); + // const data = response.data.result.itemList; + // setProducts(data); // 상품 데이터를 상태에 저장 + // console.log(data); + // } catch (error) { + // console.error('Error fetching data:', error); + // } + // }; + + // fetchData(); + // }, []); + + const handleNextSlide = () => { if (currentIndex === 2) { setCurrentIndex(0); diff --git a/yarn.lock b/yarn.lock index d266b85..7c14eb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3707,7 +3707,7 @@ axe-core@=4.7.0: axios@^1.6.7: version "1.6.7" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== dependencies: follow-redirects "^1.15.4" @@ -11660,6 +11660,11 @@ react-app-polyfill@^3.0.0: regenerator-runtime "^0.13.9" whatwg-fetch "^3.6.2" +react-daum-postcode@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/react-daum-postcode/-/react-daum-postcode-3.1.3.tgz#008a0815a08fb9356fe7845d4376dcc9363f495d" + integrity sha512-qTyzUb1BeszPFO4FXSj6p83Wrn5Zpo6YqI2EZ46XSVRZT+du9CrKg9p3KshBRFKYxXmFE1Mv7wEynzXdRFNlmQ== + react-dev-utils@^12.0.1: version "12.0.1" resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz"