Skip to content

Commit

Permalink
Feat : tmp API connect mainPage
Browse files Browse the repository at this point in the history
  • Loading branch information
qkrtjsrbs315 committed Feb 16, 2024
1 parent 05b2a16 commit d1fdaa4
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 117 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
141 changes: 37 additions & 104 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -56,118 +56,51 @@ function App() {
<Route path="/product" element={<ProductPageComponent />} />

<Route path="/posting" element={<Post />} />

{/* Seller 부분 */}
<Route path="/mypageSeller" element={<MyPageSellerComponent />}>
<Route
path="/mypageSeller/EditProfile"
element={<EditProfileSeller />}
/>
<Route
path="/mypageSeller/SellerProfile"
element={<SellerProfile />}
/>
<Route
path="/mypageSeller/ManagePurchase"
element={<ManagePurchaseSeller />}
/>
<Route
path="/mypageSeller/NotificationSettings"
element={<AlarmSeller />}
/>
<Route
path="/mypageSeller/PasswordChange"
element={<PasswordChangeSeller />}
/>
<Route
path="/mypageSeller/MemberWithdrawal"
element={<MemberWithdrawalSeller />}
/>
<Route
path="/mypageSeller/MyReview"
element={<MyReviewSeller />}
/>
<Route
path="/mypageSeller/ProfitSeller"
element={<ProfitSeller />}
/>
<Route path="EditProfile" element={<EditProfileSeller />} />
<Route path="SellerProfile" element={<SellerProfile />} />
<Route path="ManagePurchase" element={<ManagePurchaseSeller />} />
<Route path="NotificationSettings" element={<AlarmSeller />} />
<Route path="PasswordChange" element={<PasswordChangeSeller />} />
<Route path="MemberWithdrawal" element={<MemberWithdrawalSeller />} />
<Route path="MyReview" element={<MyReviewSeller />} />
<Route path="ProfitSeller" element={<ProfitSeller />} />
</Route>

<Route path="/mypage" element={<MyPageCustomerComponent />}>
<Route path="/mypage/EditProfile" element={<EditProfile />} />
<Route
path="/mypage/ManagePurchase"
element={<ManagePurchase />}
/>
<Route
path="/mypage/ManageShippingRefund"
element={<ManageShippingRefund />}
/>
<Route
path="/mypage/CustomizedInformation"
element={<CustomizedInformation />}
/>
<Route
path="/mypage/NotificationSettings"
element={<NotificationSettings />}
/>
<Route
path="/mypage/PasswordChange"
element={<PasswordChange />}
/>
<Route
path="/mypage/MemberWithdrawal"
element={<MemberWithdrawal />}
/>
<Route path="/mypage/MyReview" element={<MyReview />} />
<Route path="EditProfile" element={<EditProfile />} />
<Route path="ManagePurchase" element={<ManagePurchase />} />
<Route path="ManageShippingRefund" element={<ManageShippingRefund />} />
<Route path="CustomizedInformation" element={<CustomizedInformation />} />
<Route path="NotificationSettings" element={<NotificationSettings />} />
<Route path="PasswordChange" element={<PasswordChange />} />
<Route path="MemberWithdrawal" element={<MemberWithdrawal />} />
<Route path="MyReview" element={<MyReview />} />
</Route>

<Route path="/seller" element={<Seller />} />
<Route path="/shoppingList" element={<ShoppingList/>}/>
<Route path="/mypage" element={<MyPageComponent />}>
<Route path="/mypage" element={<MyPageCustomerComponent />}>
<Route path="/mypage/EditProfile" element={<EditProfile />} />
<Route
path="/mypage/ManagePurchase"
element={<ManagePurchase />}
/>
<Route
path="/mypage/ManageShippingRefund"
element={<ManageShippingRefund />}
/>
<Route
path="/mypage/NotificationSettings"
element={<NotificationSettings />}
/>
<Route
path="/mypage/PasswordChange"
element={<PasswordChange />}
/>
<Route
path="/mypage/MemberWithdrawal"
element={<MemberWithdrawal />}
/>
</Route>
<Route path="/shoppingList" element={<ShoppingList />} />

<Route path="/login/*" element={<Login />} />
<Route
path="/api/members/kakao/callback"
element={<KakaoLoginHandler />}
/>
<Route
path="/api/members/naver/callback"
element={<NaverLoginHandler />}
/>
<Route path="/register">
<Route path="/register" element={<Register />} />
<Route path="/register/form" element={<RegisterForm />} />
<Route path="/login">
<Route path="" element={<Login />} />
<Route path="/login/findemail" element={<FindEmail />} />
<Route path="/login/resetpw" element={<FindPassWord />} />
<Route path="/login/guest" element={<FindGuestOrder />} />
<Route path="/api/members/kakao/callback" element={<KakaoLoginHandler />} />
<Route path="/api/members/naver/callback" element={<NaverLoginHandler />} />

<Route path="/register" element={<Register />}>
<Route path="form" element={<RegisterForm />} />
</Route>

<Route path="/login" element={<Login />}>
<Route path="findemail" element={<FindEmail />} />
<Route path="resetpw" element={<FindPassWord />} />
<Route path="guest" element={<FindGuestOrder />} />
</Route>
<Route path="/register/*" element={<Register />} />

<Route path="/guest/*" element={<Guest />} />
<Route path="/helpcenter">
<Route path="/helpcenter" element={<HelpCenter />} />
<Route path="/helpcenter/write" element={<HelpCenterWrite />} />

<Route path="/helpcenter" element={<HelpCenter />}>
<Route path="write" element={<HelpCenterWrite />} />
</Route>
</Routes>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down Expand Up @@ -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);
Expand Down
7 changes: 6 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit d1fdaa4

Please sign in to comment.