Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs: QA 내역 수정 #234

Merged
merged 7 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function App() {
<Route path="/order" element={<NewOrderProcessPage />} />
{/* 마이페이지-쿠폰 확인 페이지 */}
<Route path="/coupon" element={<NewCouponPage />} />
{/* 멤버쉽 포인트 페이지 */}
{/* 멤버십 포인트 페이지 */}
<Route path="/membership" element={<NewMembershipPage />} />
{/* 장바구니 페이지 */}
<Route path="/cart" element={<NewCartPage />} />
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useFetchNewOrderHistory.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect } from "react";
import axios from "axios";
import { useEffect, useState } from "react";

const apiRoot = process.env.REACT_APP_API_ROOT;
const apiVer = "api/v1";
Expand All @@ -12,7 +12,7 @@ const useFetchNewOrderHistory = () => {
const fetchNewOrderHistory = async () => {
try {
const response = await axios.get(apiUrl, { withCredentials: true });
setNewStorageList(response.data.receipts);
setNewStorageList(response.data.receipts.reverse());
} catch (error) {
console.error("Error fetching new order history:", error);
}
Expand Down
4 changes: 3 additions & 1 deletion src/hooks/useGetPoint.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ const useGetPoint = () => {
const getPoint = async () => {
try {
const response = await axios.get(apiUrl, { withCredentials: true });
setPoint(response.data.point);
const pointValue =
response.data.point === null ? 0 : response.data.point;
setPoint(pointValue);
} catch (error) {
console.error("Error fetching events data:", error);
}
Expand Down
9 changes: 5 additions & 4 deletions src/pages/CouponPage/CouponPage.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Header from "../../components/views/Header/Header";
import { useLocation, useNavigate } from "react-router-dom";
import "./CouponPage.css";
import useFetchCoupons from "../../hooks/useFetchCoupons";
import Header from "../../components/views/Header/Header";
import Empty from "../../components/views/PageComponent/Empty";
import useFetchCoupons from "../../hooks/useFetchCoupons";
import "./CouponPage.css";

const CouponPage = () => {
const navigate = useNavigate();
Expand All @@ -21,7 +21,8 @@ const CouponPage = () => {
linkTo:
storeId && inout && cartId
? `/payment?storeId=${storeId}&inout=${inout}&cartId=${cartId}`
: `/`,
// 쿠폰함은 멤버십페이지, 메인 페이지에서 접근 가능, 뒤로가기 시, window.history.back()을 하기 위해서
: null,
}}
/>

Expand Down
2 changes: 2 additions & 0 deletions src/pages/HomePage/Homepage.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
gap: 0.6875rem;
height: 7rem;
overflow-x: auto;
margin-left: 1.5rem;
margin-right: 1.5rem;
}

.home_individual_quick_order_container::-webkit-scrollbar {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/MembershipPage/MembershipPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function MembershipPage() {
}}
/>
<main className="membershippage-point-box-container">
{/* 멤버쉽 박스 */}
{/* 멤버십 박스 */}
<div className="membershippage-point-box-wrapper">
{/* 맵버쉽 박스 윗부분_로고&포인트 */}
<div className="membershippage-point-box-top-wrapper">
Expand All @@ -36,7 +36,7 @@ function MembershipPage() {
{point.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")} P
</div>
</div>
{/* 멤버쉽 박스 아랫부분_쿠폰함&FAQ */}
{/*멤버십 박스 아랫부분_쿠폰함&FAQ */}
<div className="membershippage-point-box-bottom-wrapper">
<ul>
<li onClick={() => navigate(`/coupon`)}>쿠폰함</li>|
Expand Down
2 changes: 1 addition & 1 deletion src/pages/MyPage/MyPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function Mypage() {
className="mypage_profile_category"
onClick={() => navigate(isAuth ? `/membership` : `/login`)}
>
멤버쉽 내역
멤버십 내역
</div>
</div>

Expand Down
3 changes: 1 addition & 2 deletions src/pages/PaymentPage/PaymentPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ const PaymentPage = () => {
style={{ textDecoration: "none" }}
onClick={handleSetPoint}
>
{usedPoint === 0 ? "적용" : "적용 취소"}
{usedPoint === 0 ? "최대 적용" : "적용 취소"}
</div>
</span>
</span>
Expand Down Expand Up @@ -261,7 +261,6 @@ const PaymentPage = () => {
Math.max(totalPrice - salePrice - usedPoint, 0)
.toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ",") + "원"}
{console.log(totalPrice, salePrice, usedPoint)}
</span>
</div>

Expand Down
3 changes: 2 additions & 1 deletion src/pages/StoreDetailPage/StoreDetailPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
.store-detail-page__menuCategory {
position: relative;
overflow: hidden;
border-bottom: 1px solid rgba(216, 35, 86, 0.6);
/* border-bottom: 1px solid rgba(216, 35, 86, 0.6); */
}

.store-detail-page__menuCategory-scroll {
Expand Down Expand Up @@ -189,6 +189,7 @@
padding-left: 1.5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
border-bottom: 1px solid rgba(216, 35, 86, 0.6);
}

.store-detail-page__menuCategory__item.selected {
Expand Down
Loading